rpms/fuse/F-7 .cvsignore, 1.10, 1.11 fuse.spec, 1.20, 1.21 sources, 1.10, 1.11

[Peter Lemenkov (peter)]

Author: peter

Update of /cvs/extras/rpms/fuse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9092/F-7

Modified Files:
	.cvsignore fuse.spec sources 
Log Message:
ver. 2.7.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 May 2007 13:51:26 -0000	1.10
+++ .cvsignore	22 Jul 2007 06:00:34 -0000	1.11
@@ -1 +1 @@
-fuse-2.6.5.tar.gz
+fuse-2.7.0.tar.gz


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-7/fuse.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fuse.spec	5 Jun 2007 21:35:42 -0000	1.20
+++ fuse.spec	22 Jul 2007 06:00:34 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           fuse
-Version:        2.6.5
+Version:        2.7.0
 Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
@@ -60,9 +60,12 @@
 cp %{SOURCE3} README.fedora
 
 %build
+# Can't pass --disable-static here, or else the utils don't build
 %configure \
- --disable-static \
- --disable-kernel-module 
+ --disable-kernel-module \
+ --libdir=/%{_lib} \
+ --bindir=/bin \
+ --exec-prefix=/
 make %{?_smp_mflags}
 
 
@@ -74,8 +77,10 @@
 install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 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/%{_bindir}/fusermount
+chmod 0755 $RPM_BUILD_ROOT/bin/fusermount
 
+# Get rid of static libs
+rm -f $RPM_BUILD_ROOT/%{_lib}/*.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,8 +107,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) %{_bindir}/fusermount
-%{_bindir}/ulockmgr_server
+%attr(4754,root,fuse) /bin/fusermount
+/bin/ulockmgr_server
 %{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
 %config %{_sysconfdir}/udev/rules.d/99-fuse.rules
@@ -112,19 +117,29 @@
 %files libs
 %defattr(-,root,root,-)
 %doc COPYING.LIB
-%{_libdir}/libfuse.so.*
-%{_libdir}/libulockmgr.so.*
+/%{_lib}/libfuse.so.*
+/%{_lib}/libulockmgr.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libfuse.so
-%{_libdir}/libulockmgr.so
-%{_libdir}/pkgconfig/*.pc
+/%{_lib}/libfuse.so
+/%{_lib}/libulockmgr.so
+/%{_lib}/pkgconfig/*.pc
 %{_includedir}/fuse.h
 %{_includedir}/ulockmgr.h
 %{_includedir}/fuse
 
 %changelog
+* Sat Jul 21 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-2
+- redefine exec_prefix to /
+- redefine bindir to /bin
+- redefine libdir to %%{_lib}
+- don't pass --disable-static to configure
+- manually rm generated static libs
+
+* Wed Jul 18 2007 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-1
+- Version 2.7.0
+- Redefined exec_prefix due to demands from NTFS-3G
 
 * Wed Jun  6 2007 Peter Lemenkov <lemenkov at gmail.com> 2.6.5-2
 - Add BR libselinux-devel (bug #235145)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 May 2007 13:51:26 -0000	1.10
+++ sources	22 Jul 2007 06:00:34 -0000	1.11
@@ -1 +1 @@
-66bd30503df55a87b9868835ca5a45bc  fuse-2.6.5.tar.gz
+7c3d52f81816e3a8e0cc2b5822a37e86  fuse-2.7.0.tar.gz