Merge lp:~allison/ubuntu/oneiric/libnet-server-perl/fix-ftbfs-spec-file into lp:ubuntu/oneiric/libnet-server-perl

[Allison Randal]

The libnet-server-perl package currently has a build failure, caused by a missing VERSION variable in the file Net-Server.spec.PL. This file generates an RPM spec file, and was added to the Debian packages as a patch in 2004, at version 0.87-1. It appears to have been added to the Debian packaging in error. The file was part of the Perl module original tarball in version 0.86, but was dropped from the 0.87 release (the exact same release where it appeared as a patch in Debian).

There's no reason for us to keep maintaining an automatic RPM spec file generator that the upstream developers haven't wanted for 6 years. I've pushed a bzr branch that drops this patch, so we can immediately fix the FTBFS in Oneiric. I'll submit the change upstream to Debian too.

[Colin Watson (cjwatson)]

Looks good to me, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-14 16:41:57 +0000
+++ debian/changelog	2011-09-19 22:43:27 +0000
@@ -1,3 +1,10 @@
+libnet-server-perl (0.99-2ubuntu2) oneiric; urgency=low
+
+  * Fix FTBFS, remove ancient, unmaintained patch for generating
+    RPM spec files.
+
+ -- Allison Randal <[e-mail]>  Mon, 19 Sep 2011 15:17:48 -0700
+
 libnet-server-perl (0.99-2ubuntu1) oneiric; urgency=low
 
   [ Colin Watson ]

=== modified file 'debian/patches/00list'
--- debian/patches/00list	2011-09-14 16:41:57 +0000
+++ debian/patches/00list	2011-09-19 22:43:27 +0000
@@ -1,4 +1,3 @@
-02_spec
 03_rt-cpan-65891-reap-children
 04_fix-pod-error-in-http-manapage
 05_ipv6-support

=== removed file 'debian/patches/02_spec.dpatch'
--- debian/patches/02_spec.dpatch	2008-03-04 12:35:17 +0000
+++ debian/patches/02_spec.dpatch	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-#! /bin/sh -e
-## 02_spec.dpatch by Carsten Wolff <[e-mail]>
-## (original made by some of the former maintainers)
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Comments USER and ACCESS entries in rscsi file.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
---- libnet-server-perl-0.89.orig/Net-Server.spec.PL
-+++ libnet-server-perl-0.89/Net-Server.spec.PL
-@@ -0,0 +1,120 @@
-+# Copyright (C) 2002 Rob Brown ([e-mail])
-+# Generic rpm SPEC file generator.
-+
-+use strict;
-+
-+my $p = $1 if $0 =~ m%([^/]*)$%;
-+my $output = shift or die "create what?";
-+
-+### Extract $VERSION from VERSION_FROM
-+my $name;
-+my $version;
-+$INC{"ExtUtils/MakeMaker.pm"} = 1;
-+sub WriteMakefile {
-+  my %props = @_;
-+  $name = $props{NAME} || die "Makefile.PL: Missing NAME";
-+  if ($version = $props{VERSION}) {
-+    # done
-+  } elsif (my $version_from = $props{VERSION_FROM}) {
-+    $@ = "";
-+    $version = eval qq{
-+      do "$version_from";
-+      \$$name\::VERSION || die "$version_from: Missing VERSION";
-+    };
-+    die $@ if $@;
-+    if (!defined $version) {
-+      die "$version_from: Missing VERSION";
-+    }
-+  } else {
-+    die "Makefile.PL: Could not determine version!";
-+  }
-+}
-+do "Makefile.PL";
-+if ($name) {
-+  $name =~ s/::/-/g;
-+} else {
-+  die "Makefile.PL: Missing WriteMakefile";
-+}
-+
-+$version || die "No version!";
-+local $/ = undef;
-+$_ = <DATA>;
-+s/\@NAME\@/$name/g;
-+s/\@VERSION\@/$version/g;
-+
-+open SPEC, ">$output" or die "$output: $!";
-+print SPEC "# Automatically generated by $p\n";
-+print SPEC;
-+close SPEC;
-+
-+__DATA__
-+%define perlmod @NAME@
-+%define version @VERSION@
-+%define release 1
-+%define defperlver 5.6.1
-+
-+# Derived values
-+%define name perl-%{perlmod}
-+%define perlver %(rpm -q perl --queryformat '%%{version}' 2> /dev/null || echo %{defperlver})
-+
-+# Provide perl-specific find-{provides,requires}.
-+%define __find_provides %( echo -n /usr/lib/rpm/find-provides && [ -x /usr/lib/rpm/find-provides.perl ] && echo .perl )
-+%define __find_requires %( echo -n /usr/lib/rpm/find-requires && [ -x /usr/lib/rpm/find-requires.perl ] && echo .perl )
-+
-+Summary:        Perl module %{class}::%{subclass}
-+Name:           %{name}
-+Version:        %{version}
-+Release:        %{release}
-+Group:          Development/Perl
-+License:	Artistic
-+Source0:	http://search.cpan.org/CPAN/authors/id/R/RH/RHANDOM/%{perlmod}-%{version}.tar.gz
-+URL:		http://search.cpan.org/~rhandom/Net-Server-%{version}/
-+Vendor:		Paul Seamons <[e-mail]>
-+Packager:	Paul Seamons <[e-mail]>
-+BuildRequires:  perl
-+BuildArch:      noarch
-+BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot-%(id -u -n)
-+Requires:       perl = %{perlver}
-+Provides:       %{perlmod} = %{version}
-+
-+%description
-+Net::Server is an extensible, class oriented module written in perl
-+and intended to be the back end layer of internet protocol servers.
-+
-+%prep
-+%setup -q -n %{perlmod}-%{version}
-+
-+%build
-+%{__perl} Makefile.PL
-+%{__make} OPTIMIZE="$RPM_OPT_FLAGS"
-+%{__make} test
-+
-+%install
-+rm -rf $RPM_BUILD_ROOT
-+%{makeinstall} PREFIX=$RPM_BUILD_ROOT%{_prefix}
-+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
-+# Clean up some files we don't want/need
-+rm -rf `find $RPM_BUILD_ROOT -name "perllocal.pod" -o -name ".packlist" -o -name "*.bs"`
-+find $RPM_BUILD_ROOT%{_prefix} -type d | tac | xargs rmdir --ign
-+
-+%clean
-+rm -rf $RPM_BUILD_ROOT
-+HERE=`pwd`
-+cd ..
-+rm -rf $HERE
-+
-+%files
-+%defattr(-,root,root)
-+%doc README Changes examples
-+%{_prefix}
-+
-+%changelog
-+* Wed May 22 2002 Rob Brown <[e-mail]>
-+- RedHat style spec.
-+- It is noarch because it is implemented in pure perl
-+  (even including safe signal handling code).
-+- Include upper directories too for cleaner and
-+  safer rpm uninstall.
-+- Perl module provides and requires dependencies.
-+* Sat Apr 17 2002 Rob Brown <[e-mail]>
-+- initial creation