rpms/ntfsprogs/FC-6 ntfsprogs-1.13.1-build-extras-by-default.patch, NONE, 1.1 ntfsprogs.spec, 1.3, 1.4

Tom Callaway (spot) fedora-extras-commits at redhat.com
Wed Jul 11 21:36:30 UTC 2007


Author: spot

Update of /cvs/pkgs/rpms/ntfsprogs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv867/FC-6

Modified Files:
	ntfsprogs.spec 
Added Files:
	ntfsprogs-1.13.1-build-extras-by-default.patch 
Log Message:

Fix ntfsprogs so that we always build and install the "extra" binaries.
Before, I was manually installing the scripts, not the binaries. Whoops.
This more accurately resolves bugzilla 247398.


ntfsprogs-1.13.1-build-extras-by-default.patch:

--- NEW FILE ntfsprogs-1.13.1-build-extras-by-default.patch ---
diff -up ntfsprogs-1.13.1/ntfsprogs/Makefile.in.BAD ntfsprogs-1.13.1/ntfsprogs/Makefile.in
--- ntfsprogs-1.13.1/ntfsprogs/Makefile.in.BAD	2007-07-11 16:20:09.000000000 -0500
+++ ntfsprogs-1.13.1/ntfsprogs/Makefile.in	2007-07-11 16:21:05.000000000 -0500
@@ -39,7 +39,9 @@ host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT) ntfscluster$(EXEEXT) \
 	ntfsls$(EXEEXT) ntfscat$(EXEEXT) ntfscmp$(EXEEXT) \
-	$(am__EXEEXT_3)
+	ntfsdump_logfile$(EXEEXT) ntfswipe$(EXEEXT) \
+	ntfstruncate$(EXEEXT) ntfsmove$(EXEEXT) ntfsmftalloc$(EXEEXT) \
+	$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
 sbin_PROGRAMS = mkntfs$(EXEEXT) ntfslabel$(EXEEXT) \
 	ntfsundelete$(EXEEXT) ntfsresize$(EXEEXT) ntfsclone$(EXEEXT) \
 	ntfscp$(EXEEXT)
diff -up ntfsprogs-1.13.1/ntfsprogs/Makefile.am.BAD ntfsprogs-1.13.1/ntfsprogs/Makefile.am
--- ntfsprogs-1.13.1/ntfsprogs/Makefile.am.BAD	2007-07-11 16:16:54.000000000 -0500
+++ ntfsprogs-1.13.1/ntfsprogs/Makefile.am	2007-07-11 16:19:06.000000000 -0500
@@ -11,7 +11,9 @@ endif
 # Workaround to make REALLYSTATIC work with automake 1.5.
 LINK=$(STATIC_LINK) $(LIBTOOL_LINK)
 
-bin_PROGRAMS		= ntfsfix ntfsinfo ntfscluster ntfsls ntfscat ntfscmp
+bin_PROGRAMS		= ntfsfix ntfsinfo ntfscluster ntfsls ntfscat ntfscmp \
+			  ntfsdump_logfile ntfswipe ntfstruncate ntfsmove \
+			  ntfsmftalloc
 sbin_PROGRAMS		= mkntfs ntfslabel ntfsundelete ntfsresize ntfsclone \
 			  ntfscp
 EXTRA_PROGRAMS		= ntfsdump_logfile ntfswipe ntfstruncate ntfsmove \
@@ -35,6 +37,7 @@ endif
 
 if ENABLE_CRYPTO
 EXTRA_PROGRAMS		+= ntfsdecrypt
+bin_PROGRAMS		+= ntfsdecrypt
 endif
 
 if ENABLE_RICH


Index: ntfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntfsprogs/FC-6/ntfsprogs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ntfsprogs.spec	9 Jul 2007 15:48:03 -0000	1.3
+++ ntfsprogs.spec	11 Jul 2007 21:35:58 -0000	1.4
@@ -1,8 +1,9 @@
 Name:		ntfsprogs
 Version:	1.13.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	NTFS filesystem libraries and utilities
 Source0:	http://download.sf.net/linux-ntfs/%{name}-%{version}.tar.gz
+Patch0:		ntfsprogs-1.13.1-build-extras-by-default.patch
 License:	GPL
 URL:		http://www.linux-ntfs.org/
 Group:		System Environment/Base
@@ -38,25 +39,17 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # If we need to enable the fuse module, we'd change this.
 # The ntfs-3g stuff is better than what is here currently, so we'll let people use it.
 %configure --enable-gnome-vfs --disable-fuse-module --disable-static --enable-test --enable-crypto
 make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
-make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} extra
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-# Don't install these extra files.
-# They complain that they should never be installed.
-# install -m0755 ntfsprogs/ntfsdump_logfile $RPM_BUILD_ROOT%{_bindir}
-# install -m0755 ntfsprogs/ntfswipe $RPM_BUILD_ROOT%{_bindir}
-# install -m0755 ntfsprogs/ntfstruncate $RPM_BUILD_ROOT%{_bindir}
-# install -m0755 ntfsprogs/ntfsmove $RPM_BUILD_ROOT%{_bindir}
-# install -m0755 ntfsprogs/ntfsmftalloc $RPM_BUILD_ROOT%{_bindir}
-# install -m0755 ntfsprogs/ntfsdecrypt $RPM_BUILD_ROOT%{_bindir}
 
 # We're not including ntfsmount, so we don't need the manpages
 rm -rf $RPM_BUILD_ROOT%{_mandir}/man8/ntfsmount*
@@ -113,6 +106,10 @@
 %{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.so
 
 %changelog
+* Wed Jul 11 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.13.1-6
+- build and install "extra" binaries by default (I was accidentally installing the scripts, not the binaries)
+  This better resolves bz 247398 (thanks to Martin Riarte)
+
 * Mon Jul  9 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.13.1-5
 - don't package items which say they should never be installed (resolves bz 247398)
 




More information about the scm-commits mailing list