diff --git a/pilot-link.spec b/pilot-link.spec index 10f6c12..03b23ec 100644 --- a/pilot-link.spec +++ b/pilot-link.spec @@ -4,7 +4,7 @@ Summary: File transfer utilities between Linux and PalmPilots. Name: pilot-link Version: 0.11.8 -Release: 14 +Release: 15 Source: pilot-link-%{version}.tar.bz2 Url: http://www.pilot-link.org/ Patch1: pilot-link-0.11.0-perlmd5.patch @@ -15,6 +15,7 @@ Patch6: pilot-link-0.11.8-size.patch Patch7: pilot-link-0.11.8-readfile.patch Patch8: pilot-link-0.11.8-underquoted.patch Patch9: pilot-link-0.11.8-misc1.patch +Patch10: pilot-link-0.11.8-realpath.path Epoch: 2 License: GPL Group: Applications/Communications @@ -69,9 +70,10 @@ need to install pilot-link-devel. %patch7 -p1 -b .read %patch8 -p1 -b .underquoted %patch9 -p1 -b .misc1 +%patch10 -p1 -b .realpath %build -CFLAGS="$RPM_OPT_FLAGS" %configure \ +CFLAGS="%{optflags}" %configure \ --with-python=no \ --with-itcl=no \ --with-tk=no \ @@ -87,13 +89,13 @@ CFLAGS="$RPM_OPT_FLAGS" %configure \ make %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %if %{support_perl} if test -f bindings/Perl/Makefile.PL ; then cd bindings/Perl perl -pi -e 's|^\$libdir =.*|\$libdir = "%{buildroot}%{_libdir}";|g' Makefile.PL - CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor + CFLAGS="%{optflags}" perl Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor make cd ../.. fi @@ -106,10 +108,12 @@ fi make install -C bindings/Perl rm -f %{buildroot}%{_libdir}/perl5/vendor_perl/%{perl_version}/*/auto/PDA/Pilot/Pilot.bs \ %{buildroot}%{_libdir}/perl5/site_perl/*/*/*/PDA/Pilot/.packlist +%else + rm -f %{buildroot}%{_mandir}/man1/ietf2datebook* %endif # remove files we don't want to include -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la +rm -f %{buildroot}%{_libdir}/*.la # remove broken prog rm -f %{buildroot}%{_bindir}/pilot-prc @@ -119,7 +123,7 @@ rm -f %{buildroot}%{_bindir}/pilot-prc %postun -p /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -141,6 +145,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/*.m4 %changelog +* Fri Apr 21 2006 Than Ngo 2:0.11.8-15 +- fix pilot-xfer crash on missing device node #186779, #175334 +- don't include unnecessary man page #185147 + * Wed Mar 29 2006 Than Ngo 2:0.11.8-14 - rebuild to get rid of libpisock.so.9