Changeset 1726

Show
Ignore:
Timestamp:
05/10/05 00:14:08 (4 years ago)
Author:
augur
Message:

Fri Apr 08 2005 Bernhard Weisshuhn <bkw@weisshuhn.de>

Differentiate between libdir and libexecdir (for x86_64)
Use swish-config from builddir for perl-build (pretty crude)
remove buildroot prior to install
Added pkgconfig and swish-config to devel package

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/swish-e/rpm/swish-e.spec.in

    r1539 r1726  
    8080 
    8181%build 
    82 %configure --with-pcre=/usr --with-libxml2=/usr --with-zlib=/usr 
     82%configure --with-pcre=/usr --with-libxml2=/usr --with-zlib=/usr --libexecdir=%{_libexecdir}/swish-e 
    8383make 
    8484 
    8585# Make SWISH::API 
     86cp %{_builddir}/%{name}-%{version}/swish-config %{_builddir}/%{name}-%{version}/src/ 
     87chmod +x %{_builddir}/%{name}-%{version}/src/swish-config 
    8688pushd perl 
    8789grep -rsl '^#!.*perl' . | 
    …… 
    8991%__perl -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' 
    9092 
    91 CFLAGS="$RPM_OPT_FLAGS" SWISHBIN="%{_builddir}/%{name}-%{version}/src/swish-e" %{__perl} Makefile.PL `%{__perl} -MExtUtils::MakeMaker -e ' print qq|PREFIX=%{buildroot}%{_prefix}| if \$ExtUtils::MakeMaker::VERSION =~ /5\.9[1-6]|6\.0[0-5]/ '`  
     93CFLAGS="$RPM_OPT_FLAGS" SWISHBIN="%{_builddir}/%{name}-%{version}/src/swish-e" SWISHBINDIR="%{_builddir}/%{name}-%{version}/src" %{__perl} Makefile.PL `%{__perl} -MExtUtils::MakeMaker -e ' print qq|PREFIX=%{buildroot}%{_prefix}| if \$ExtUtils::MakeMaker::VERSION =~ /5\.9[1-6]|6\.0[0-5]/ '`  
    9294 
    9395%{__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' 
    …… 
    99101 
    100102%install 
     103[ "%{buildroot}" != "/" ] && [ -d %{buildroot} ] && %{__rm} -rf %{buildroot}; 
    101104%{__make} DESTDIR=$RPM_BUILD_ROOT prefix=%{prefix} sysconfdir=%{sysconfdir} install 
    102105 
    …… 
    131134 
    132135# build list of installed SWISH::API files 
     136mkdir -p %{_tmppath}/%{name}-%{version} 2>/dev/null 
    133137%{__perl} -le ' 
    134138use strict; 
    …… 
    167171%defattr(-, root, root) 
    168172%{_bindir}/swish-e 
     173%{_libexecdir}/swish-e 
    169174%{_libdir}/*.so.* 
    170175%{_mandir}/man[^3]/* 
    …… 
    174179%defattr(-, root, root) 
    175180%{_bindir}/swish-filter-test 
    176 %{_libdir}/swish-e/* 
     181%{_libexecdir}/swish-e/* 
    177182%{_datadir}/swish-e/* 
    178183 
    …… 
    189194%{_libdir}/*.a 
    190195%{_libdir}/*.so 
     196%{_libdir}/pkgconfig/*.pc 
     197%{_bindir}/swish-config 
    191198 
    192199%changelog 
     200* Fri Apr 08 2005 Bernhard Weisshuhn <bkw@weisshuhn.de> 2.4.3-5 
     201- Differentiate between libdir and libexecdir (for x86_64) 
     202- Use swish-config from builddir for perl-build (pretty crude) 
     203- remove buildroot prior to install 
     204- Added pkgconfig and swish-config to devel package 
    193205* Sun Nov 07 2004 David L Norris <dave@webaugur.com> 2.5.2-4 
    194206- Simplify File::Find script.  Merge HTML docs with swish-e package.