From 065ec622ec3eb9e8f6341a515d60782ea4e63e55 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Jul 24 2007 16:14:51 +0000 Subject: Fix issues (pkgconfig, compat symlinks) --- diff --git a/fuse.spec b/fuse.spec index 8de2fde..cc8ac72 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,6 +1,6 @@ Name: fuse Version: 2.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -78,10 +78,19 @@ install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse # change from 4755 to 0755 to allow stripping -- fixed later in files chmod 0755 $RPM_BUILD_ROOT/bin/fusermount +# Put pc file in correct place +mkdir -p $RPM_BUILD_ROOT%{_libdir} +mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir} # Get rid of static libs rm -f $RPM_BUILD_ROOT/%{_lib}/*.a +# Compatibility symlinks +mkdir -p $RPM_BUILD_ROOT%{_bindir} +cd $RPM_BUILD_ROOT%{_bindir} +ln -s /bin/fusermount fusermount +ln -s /bin/ulockmgr_server ulockmgr_server + %clean rm -rf $RPM_BUILD_ROOT @@ -111,6 +120,9 @@ fi /bin/ulockmgr_server %{_sysconfdir}/init.d/fuse %{_sysconfdir}/makedev.d/z-fuse +# Compat symlinks +%{_bindir}/fusermount +%{_bindir}/ulockmgr_server %config %{_sysconfdir}/udev/rules.d/99-fuse.rules %config %{_sysconfdir}/udev/makedev.d/99-fuse.nodes @@ -124,12 +136,16 @@ fi %defattr(-,root,root,-) /%{_lib}/libfuse.so /%{_lib}/libulockmgr.so -/%{_lib}/pkgconfig/*.pc +%{_libdir}/pkgconfig/*.pc %{_includedir}/fuse.h %{_includedir}/ulockmgr.h %{_includedir}/fuse %changelog +* Sun Jul 22 2007 Tom "spot" Callaway 2.7.0-3 +- put pkgconfig file in correct place +- enable compat symlinks for files in /bin + * Sat Jul 21 2007 Tom "spot" Callaway 2.7.0-2 - redefine exec_prefix to / - redefine bindir to /bin