Changeset 2154 for swish-e/branches/2.6/rpm

Timestamp:

08/05/08 18:42:12 (5 months ago)

Author:

joshr

Message:

Fix rpm builds on F9. Patch from Steven Pritchard.

Files:

• swish-e/branches/2.6/rpm/swish-e.spec.in (modified) (4 diffs)

swish-e/branches/2.6/rpm/swish-e.spec.in

@@ -4 +4 @@
-
-# SWISH::API definitions
-%define filelist %{_tmppath}/%{name}-%{version}/%{name}-%{version}-filelist
-%define NVR %{name}-%{version}-%{release}
-
@@ -86 +85 @@
-%__perl -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)'
-
-CFLAGS="$RPM_OPT_FLAGS" SWISHBIN="%{_builddir}/%{name}-%{version}/src/swish-e" SWISHBINDIR="%{_builddir}/%{name}-%{version}/src" %{__perl} Makefile.PL
+SWISHBIN="%{_builddir}/%{name}-%{version}/src/swish-e" SWISHBINDIR="%{_builddir}/%{name}-%{version}/src" %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
-
-%{__make} PREFIX=%{buildroot}%{_prefix} LIB='%{_libdir}' LIBS='-L%{_libdir} -L%{buildroot}/src/.libs -lswish-e -lz' 'LDFLAGS=-L%{_libdir} -L%{_builddir}/%{name}-%{version}/src/.libs' 'CCFLAGS=-I%{_builddir}/%{name}-%{version}/src' 'LDDLFLAGS=-shared -L%{_builddir}/%{name}-%{version}/src/.libs/ -lswish-e'
@@ -116 +115 @@
-    -exec rmdir {} \; 2>/dev/null
-
-# build list of installed SWISH::API files
-mkdir -p %{_tmppath}/%{name}-%{version} 2>/dev/null
-%{__perl} -le '
-use strict;
-use File::Find;
-use File::Spec;
-use Config qw(%Config);
-
-my $buildroot = "%{buildroot}";
-my $sitearch = File::Spec->catdir( $buildroot , $Config{installsitearch} );
-my @sitearch;
-
-find( sub{ 
-        push(@sitearch, $File::Find::name =~ /\Q$buildroot\E(.+)$/);
-    }, $sitearch );
-
-$" = "\n";
-print <<EOF;
-@sitearch
-EOF
-' > %{filelist}
-
-[ -z %filelist ] && {
-    echo "ERROR: empty files listing"
-    exit -1
-    } 
-popd
-# end install SWISH::API
-
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
@@ -165 +135 @@
-%{_datadir}/swish-e/*
-
- -f %filelist
+
-%defattr(-,root,root)
-%doc perl/Changes perl/README
+%{perl_vendorarch}/auto/*
+%{perl_vendorarch}/SWISH*
-%{_mandir}/man3/SWISH::API.3pm*
-