Author: spot
Update of /cvs/pkgs/rpms/ntfsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13098
Modified Files:
.cvsignore ntfsprogs.spec sources
Added Files:
ntfsprogs-2.0.0-build-extras-by-default.patch
ntfsprogs-2.0.0-glibc27-open.patch
Log Message:
2.0.0
ntfsprogs-2.0.0-build-extras-by-default.patch:
--- NEW FILE ntfsprogs-2.0.0-build-extras-by-default.patch ---
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 ntfsck
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
diff -up ntfsprogs-2.0.0/ntfsprogs/Makefile.in.BAD ntfsprogs-2.0.0/ntfsprogs/Makefile.in
--- ntfsprogs-2.0.0/ntfsprogs/Makefile.in.BAD 2007-11-30 08:50:49.000000000 -0500
+++ ntfsprogs-2.0.0/ntfsprogs/Makefile.in 2007-11-30 08:51:33.000000000 -0500
@@ -35,7 +35,9 @@ host_triplet = @host@
target_triplet = @target@
bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT) ntfscluster$(EXEEXT) \
ntfsls$(EXEEXT) ntfscat$(EXEEXT) ntfscmp$(EXEEXT) \
- $(am__EXEEXT_2)
+ ntfsdump_logfile$(EXEEXT) ntfswipe$(EXEEXT) \
+ ntfstruncate$(EXEEXT) ntfsmove$(EXEEXT) ntfsmftalloc$(EXEEXT) \
+ ntfsck$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
sbin_PROGRAMS = mkntfs$(EXEEXT) ntfslabel$(EXEEXT) \
ntfsundelete$(EXEEXT) ntfsresize$(EXEEXT) ntfsclone$(EXEEXT) \
ntfscp$(EXEEXT)
ntfsprogs-2.0.0-glibc27-open.patch:
--- NEW FILE ntfsprogs-2.0.0-glibc27-open.patch ---
diff -up ntfsprogs-1.13.1/ntfsprogs/mkntfs.c.BAD ntfsprogs-1.13.1/ntfsprogs/mkntfs.c
--- ntfsprogs-1.13.1/ntfsprogs/mkntfs.c.BAD 2007-08-24 14:11:41.000000000 -0400
+++ ntfsprogs-1.13.1/ntfsprogs/mkntfs.c 2007-08-24 14:11:51.000000000 -0400
@@ -3369,7 +3369,7 @@ static BOOL mkntfs_open_partition(ntfs_v
} else {
i = O_RDWR;
}
- if (vol->dev->d_ops->open(vol->dev, i)) {
+ if ((vol->dev->d_ops->open)(vol->dev, i)) {
if (errno == ENOENT)
ntfs_log_error("The device doesn't exist; did you specify it
correctly?\n");
else
diff -up ntfsprogs-2.0.0/libntfs/volume.c.BAD ntfsprogs-2.0.0/libntfs/volume.c
--- ntfsprogs-2.0.0/libntfs/volume.c.BAD 2007-11-30 08:53:52.000000000 -0500
+++ ntfsprogs-2.0.0/libntfs/volume.c 2007-11-30 08:54:15.000000000 -0500
@@ -478,7 +478,7 @@ ntfs_volume *ntfs_volume_startup(struct
if (flags & NTFS_MNT_INTERIX)
NVolSetInterix(vol);
ntfs_log_debug("Reading bootsector... ");
- if (dev->d_ops->open(dev, NVolReadOnly(vol) ? O_RDONLY :
+ if ((dev->d_ops->open)(dev, NVolReadOnly(vol) ? O_RDONLY :
((flags & NTFS_MNT_NOT_EXCLUSIVE) ? O_RDWR :
(O_RDWR | O_EXCL)))) {
ntfs_log_debug(FAILED);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ntfsprogs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 22 Oct 2006 03:27:58 -0000 1.2
+++ .cvsignore 30 Nov 2007 19:36:51 -0000 1.3
@@ -1 +1 @@
-ntfsprogs-1.13.1.tar.gz
+ntfsprogs-2.0.0.tar.bz2
Index: ntfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntfsprogs/devel/ntfsprogs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ntfsprogs.spec 24 Aug 2007 18:15:09 -0000 1.7
+++ ntfsprogs.spec 30 Nov 2007 19:36:51 -0000 1.8
@@ -1,16 +1,16 @@
Name: ntfsprogs
-Version: 1.13.1
-Release: 7%{?dist}.2
+Version: 2.0.0
+Release: 1%{?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
-Patch1: ntfsprogs-1.13.1-glibc27-open.patch
+Source0:
http://download.sf.net/linux-ntfs/%{name}-%{version}.tar.bz2
+Patch0: ntfsprogs-2.0.0-build-extras-by-default.patch
+Patch1: ntfsprogs-2.0.0-glibc27-open.patch
License: GPLv2+
URL:
http://www.linux-ntfs.org/
Group: System Environment/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: glib2-devel, gnome-vfs2-devel, libtool
-BuildRequires: libgcrypt-devel, gnutls-devel
+BuildRequires: glib2-devel, gnome-vfs2-devel, libtool, libconfig-devel
+BuildRequires: libgcrypt-devel, gnutls-devel, e2fsprogs-devel
%description
The Linux-NTFS project (
http://www.linux-ntfs.org/) aims to bring full support
@@ -46,7 +46,7 @@
%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
+%configure --enable-gnome-vfs --disable-ntfsmount --disable-static --enable-test
--enable-crypto
make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
%install
@@ -92,6 +92,7 @@
%{_mandir}/man8/mkntfs.8*
%{_mandir}/man8/mkfs.ntfs.8*
%{_mandir}/man8/ntfs[^m][^o]*.8*
+%{_mandir}/man8/libntfs*
%{_libdir}/libntfs.*so.*
%files gnomevfs
@@ -108,6 +109,9 @@
%{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.so
%changelog
+* Fri Nov 30 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.0-1
+- bump to 2.0
+
* Fri Aug 24 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 1.13.1-7.2
- fix open call (glibc2.7)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntfsprogs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 22 Oct 2006 03:27:58 -0000 1.2
+++ sources 30 Nov 2007 19:36:51 -0000 1.3
@@ -1 +1 @@
-23160eb8d34abe3d2a88cd6d054faa47 ntfsprogs-1.13.1.tar.gz
+2b39dece8897bc748f4ab4c40ec7699e ntfsprogs-2.0.0.tar.bz2