rpms/pmount/devel pmount-0.9.17-nosetuid.patch, NONE, 1.1 pmount.spec, 1.4, 1.5 pmount-0.9.13-nosetuid.patch, 1.1, NONE

[Patrice Dumas]

Author: pertusus

Update of /cvs/extras/rpms/pmount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13584

Modified Files:
	pmount.spec 
Added Files:
	pmount-0.9.17-nosetuid.patch 
Removed Files:
	pmount-0.9.13-nosetuid.patch 
Log Message:
* Thu Sep 25 2008 Patrice Dumas <pertusus at free.fr> 0.9.17-3
- rediff nosetuid patch


pmount-0.9.17-nosetuid.patch:

--- NEW FILE pmount-0.9.17-nosetuid.patch ---
diff -up pmount-0.9.17/src/Makefile.in.nosetuid pmount-0.9.17/src/Makefile.in
--- pmount-0.9.17/src/Makefile.in.nosetuid	2007-12-29 21:43:20.000000000 +0100
+++ pmount-0.9.17/src/Makefile.in	2008-09-25 18:27:55.000000000 +0200
@@ -262,7 +262,7 @@ EXTRA_DIST = \
 	utils.h  \
 	realpath.h
 
-INSTALL_DIR = $(DESTDIR)/$(prefix)/bin
+INSTALL_DIR = $(DESTDIR)/$(bindir)
 INSTALL_SRC = $(top_builddir)/src
 all: all-am
 
@@ -573,8 +573,8 @@ uninstall-am: uninstall-binPROGRAMS unin
 
 install-data-hook:
 	test -z $(INSTALL_DIR) || mkdir -p -- $(INSTALL_DIR)
-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
+	$(INSTALL_DATA) -m 755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
+	$(INSTALL_DATA) -m 755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
 
 uninstall-hook:
 	rm -f $(INSTALL_DIR)/pmount


Index: pmount.spec
===================================================================
RCS file: /cvs/extras/rpms/pmount/devel/pmount.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pmount.spec	1 Mar 2008 22:48:39 -0000	1.4
+++ pmount.spec	25 Sep 2008 16:53:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           pmount
 Version:        0.9.17
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Enable normal user mount
 
 Group:          System Environment/Base
@@ -9,7 +9,7 @@
 URL:            http://pmount.alioth.debian.org/
 Source0:        http://alioth.debian.org/frs/download.php/2247/pmount-%{version}.tar.gz
 # don't set the setuid bits during make install
-Patch0:         pmount-0.9.13-nosetuid.patch
+Patch0:         pmount-0.9.17-nosetuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  intltool gettext pkgconfig
@@ -60,6 +60,9 @@
 %{_mandir}/man1/p*mount*.1*
 
 %changelog
+* Thu Sep 25 2008 Patrice Dumas <pertusus at free.fr> 0.9.17-3
+- rediff nosetuid patch
+
 * Sat Mar  1 2008 Patrice Dumas <pertusus at free.fr> 0.9.17-2
 - update to 0.9.17
 - remove pmount-0.9.13-keeppublic.patch now that dbus connection is private


--- pmount-0.9.13-nosetuid.patch DELETED ---