rpms/nilfs-utils/F-11 nilfs-utils-2.0.14-no-cleanerd-chown.patch, NONE, 1.1 nilfs-utils.spec, NONE, 1.1 sources, 1.1, 1.2

Eric Sandeen sandeen at fedoraproject.org
Thu Jul 30 23:12:16 UTC 2009


Author: sandeen

Update of /cvs/pkgs/rpms/nilfs-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3220

Modified Files:
	sources 
Added Files:
	nilfs-utils-2.0.14-no-cleanerd-chown.patch nilfs-utils.spec 
Log Message:
* Thu Jul 30 2009 Eric Sandeen <sandeen at redhat.com> 2.0.14-2
- Fix libuuid-devel dep, fix odd chown in make install


nilfs-utils-2.0.14-no-cleanerd-chown.patch:
 cleanerd/Makefile.am |    6 ------
 cleanerd/Makefile.in |    5 -----
 mkfs/Makefile.am     |    6 ------
 mkfs/Makefile.in     |    5 -----
 mount/Makefile.am    |    6 ------
 mount/Makefile.in    |    5 -----
 6 files changed, 33 deletions(-)

--- NEW FILE nilfs-utils-2.0.14-no-cleanerd-chown.patch ---
Index: nilfs-utils-2.0.14/sbin/cleanerd/Makefile.am
===================================================================
--- nilfs-utils-2.0.14.orig/sbin/cleanerd/Makefile.am
+++ nilfs-utils-2.0.14/sbin/cleanerd/Makefile.am
@@ -14,9 +14,3 @@ nilfs_cleanerd_CPPFLAGS = -I$(top_srcdir
 nilfs_cleanerd_LDADD = $(top_builddir)/lib/libnilfs.la
 
 dist_sysconf_DATA = nilfs_cleanerd.conf
-
-install-exec-hook:
-	list='$(sbin_PROGRAMS)'; \
-	for p in $$list; do \
-		chown root $(DESTDIR)$(sbindir)/$$p$(EXEEXT); \
-	done
Index: nilfs-utils-2.0.14/sbin/cleanerd/Makefile.in
===================================================================
--- nilfs-utils-2.0.14.orig/sbin/cleanerd/Makefile.in
+++ nilfs-utils-2.0.14/sbin/cleanerd/Makefile.in
@@ -542,11 +542,6 @@ uninstall-am: uninstall-dist_sysconfDATA
 	uninstall-sbinPROGRAMS
 
 
-install-exec-hook:
-	list='$(sbin_PROGRAMS)'; \
-	for p in $$list; do \
-		chown root $(DESTDIR)$(sbindir)/$$p$(EXEEXT); \
-	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: nilfs-utils-2.0.14/sbin/mkfs/Makefile.am
===================================================================
--- nilfs-utils-2.0.14.orig/sbin/mkfs/Makefile.am
+++ nilfs-utils-2.0.14/sbin/mkfs/Makefile.am
@@ -10,9 +10,3 @@ mkfs_nilfs2_SOURCES = mkfs.c bitops.c ..
 mkfs_nilfs2_CFLAGS = -Wall
 mkfs_nilfs2_CPPFLAGS = -I$(top_srcdir)/include
 mkfs_nilfs2_LDADD = -luuid
-
-install-exec-hook:
-	list='$(sbin_PROGRAMS)'; \
-	for p in $$list; do \
-		chown root $(DESTDIR)$(sbindir)/$$p$(EXEEXT); \
-	done
Index: nilfs-utils-2.0.14/sbin/mkfs/Makefile.in
===================================================================
--- nilfs-utils-2.0.14.orig/sbin/mkfs/Makefile.in
+++ nilfs-utils-2.0.14/sbin/mkfs/Makefile.in
@@ -507,11 +507,6 @@ uninstall-am: uninstall-sbinPROGRAMS
 	tags uninstall uninstall-am uninstall-sbinPROGRAMS
 
 
-install-exec-hook:
-	list='$(sbin_PROGRAMS)'; \
-	for p in $$list; do \
-		chown root $(DESTDIR)$(sbindir)/$$p$(EXEEXT); \
-	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: nilfs-utils-2.0.14/sbin/mount/Makefile.am
===================================================================
--- nilfs-utils-2.0.14.orig/sbin/mount/Makefile.am
+++ nilfs-utils-2.0.14/sbin/mount/Makefile.am
@@ -20,9 +20,3 @@ mount_nilfs2_LDADD = $(top_builddir)/lib
 
 umount_nilfs2_SOURCES = umount.nilfs2.c $(COMMONSOURCES) $(COMMONHEADERS)
 umount_nilfs2_LDADD = $(top_builddir)/lib/libnilfsmisc.la
-
-install-exec-hook:
-	list='$(sbin_PROGRAMS)'; \
-	for p in $$list; do \
-		chown root $(DESTDIR)$(sbindir)/$$p$(EXEEXT); \
-	done
Index: nilfs-utils-2.0.14/sbin/mount/Makefile.in
===================================================================
--- nilfs-utils-2.0.14.orig/sbin/mount/Makefile.in
+++ nilfs-utils-2.0.14/sbin/mount/Makefile.in
@@ -485,11 +464,6 @@ uninstall-am: uninstall-sbinPROGRAMS
 	tags uninstall uninstall-am uninstall-sbinPROGRAMS
 
 
-install-exec-hook:
-	list='$(sbin_PROGRAMS)'; \
-	for p in $$list; do \
-		chown root $(DESTDIR)$(sbindir)/$$p$(EXEEXT); \
-	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:


--- NEW FILE nilfs-utils.spec ---
%global _root_libdir	/%{_lib}
%global _root_sbindir 	/sbin

Name:		nilfs-utils
Version:	2.0.14
Release:	2%{?dist}
Summary:	Utilities for managing NILFS v2 filesystems

Group:		System Environment/Base
License:	GPLv2+
URL:		http://www.nilfs.org
Source0:	http://www.nilfs.org/download/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	e2fsprogs-devel

# Upstream is trying to chown binaries to root; this won't work
# when a mere mortal installs to a chroot.  Will be fixed
# upstream.
Patch0:		nilfs-utils-2.0.14-no-cleanerd-chown.patch

%description
Userspace utilities for creating and mounting NILFS v2 filesystems.

%package devel
Summary:	NILFS2 filesystem-specific headers
Group:		Development/Libraries
Requires:	nilfs-utils = %{version}-%{release}

%description devel
nilfs-utils-devel contains the header files needed to develop NILFS
filesystem-specific programs.

You should install nilfs-utils-devel if you want to develop NILFS
filesystem-specific programs. If you install nilfs-utils-devel, you'll
also want to install nilfs-utils.

%prep
%setup -q
%patch0 -p1

%build
# geez, make install is trying to run ldconfig on the system
%configure LDCONFIG=/bin/true --disable-static --libdir %{_root_libdir}
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_root_libdir}/libnilfs.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog
%config(noreplace) /etc/nilfs_cleanerd.conf
%{_root_sbindir}/mkfs.nilfs2
%{_root_sbindir}/mount.nilfs2
%{_root_sbindir}/nilfs_cleanerd
%{_root_sbindir}/umount.nilfs2
%{_bindir}/chcp
%{_bindir}/dumpseg
%{_bindir}/lscp
%{_bindir}/lssu
%{_bindir}/mkcp
%{_bindir}/rmcp
%{_mandir}/man1/lscp.1.gz
%{_mandir}/man1/lssu.1.gz
%{_mandir}/man5/nilfs_cleanerd.conf.5.gz
%{_mandir}/man8/chcp.8.gz
%{_mandir}/man8/dumpseg.8.gz
%{_mandir}/man8/mkcp.8.gz
%{_mandir}/man8/mkfs.nilfs2.8.gz
%{_mandir}/man8/mount.nilfs2.8.gz
%{_mandir}/man8/nilfs.8.gz
%{_mandir}/man8/nilfs_cleanerd.8.gz
%{_mandir}/man8/rmcp.8.gz
%{_mandir}/man8/umount.nilfs2.8.gz
%{_root_libdir}/libnilfs.so.*

%files devel
%defattr(-,root,root,-)
%{_root_libdir}/libnilfs.so
%{_includedir}/nilfs.h
%{_includedir}/nilfs2_fs.h

%changelog
* Thu Jul 30 2009 Eric Sandeen <sandeen at redhat.com> 2.0.14-2
- Fix libuuid-devel dep, fix odd chown in make install

* Wed Jul 29 2009 Eric Sandeen <sandeen at redhat.com> 2.0.14-1
- New upstream release

* Wed Jun 10 2009 Eric Sandeen <sandeen at redhat.com> 2.0.12-1
- Initial fedora package



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nilfs-utils/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Jul 2009 22:55:05 -0000	1.1
+++ sources	30 Jul 2009 23:12:16 -0000	1.2
@@ -0,0 +1 @@
+96e3de978c68d69d3ffb1e975c275cbe  nilfs-utils-2.0.14.tar.bz2




More information about the fedora-extras-commits mailing list