rpms/torrentzip/devel trrntzip-0.2-chmod.patch, NONE, 1.1 torrentzip.spec, 1.6, 1.7 patch-src-trrntzip.c, 1.1, NONE

[Matthias Saou]

Author: thias

Update of /cvs/free/rpms/torrentzip/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20321

Modified Files:
	torrentzip.spec 
Added Files:
	trrntzip-0.2-chmod.patch 
Removed Files:
	patch-src-trrntzip.c 
Log Message:
Minor changes, going to test a plague rebuild


trrntzip-0.2-chmod.patch:
 trrntzip.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE trrntzip-0.2-chmod.patch ---
--- src/trrntzip.c-orig	Mon May  2 08:38:40 2005
+++ src/trrntzip.c	Sat May  7 02:51:55 2005
@@ -716,7 +716,7 @@
   
     if (dirp)
     {
-      // First set all the files to read-only. This is so we can skip
+      // First set the sticky bit on all files. This is so we can skip
       // our new zipfiles if they are returned by readdir() a second time.
       while (direntp = readdir (dirp))
       {
@@ -732,7 +732,7 @@
   
           if (strstr (szTmpBuf, ".zip\0"))
           {
-            chmod (direntp->d_name, S_IRUSR);
+            chmod (direntp->d_name, istat.st_mode | S_ISUID);
           }
         }
         // Zip file is actually a dir
@@ -780,9 +780,9 @@
           sprintf (szTmpBuf, "%s", direntp->d_name);
           strlwr (szTmpBuf);
   
-          if (strstr (szTmpBuf, ".zip\0") && !(istat.st_mode & S_IWUSR))
+          if (strstr (szTmpBuf, ".zip\0") && (istat.st_mode & S_ISUID))
           {            
-            chmod (direntp->d_name, S_IWUSR);
+            chmod (direntp->d_name, istat.st_mode & ~S_ISUID);
             mig.cEncounteredZips++;
   
             if (!mig.fProcessLog)

 	  	 


Index: torrentzip.spec
===================================================================
RCS file: /cvs/free/rpms/torrentzip/devel/torrentzip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- torrentzip.spec	4 Apr 2012 12:37:40 -0000	1.6
+++ torrentzip.spec	5 Apr 2012 20:26:30 -0000	1.7
@@ -1,14 +1,15 @@
+# We patch the same files multiple times, so we have slight differences
 %define _default_patch_fuzz 2
 
 Summary: Create identical zip files over multiple systems
 Name: torrentzip
 Version: 0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/File
 URL: http://sourceforge.net/projects/trrntzip
 Source: http://dl.sf.net/trrntzip/trrntzip_v02_src.tar.gz
-Patch0: patch-src-trrntzip.c
+Patch0: trrntzip-0.2-chmod.patch
 Patch1: trrntzip-0.2-warningfixes.patch
 Patch2: trrntzip-0.2-help.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -22,7 +23,7 @@
 
 
 %prep
-%setup -n trrntzip
+%setup -q -n trrntzip
 %patch0 -p0 -b .chmod
 %patch1 -p1 -b .warningfixes
 %patch2 -p1 -b .help
@@ -45,15 +46,16 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-, root, root, -)
 %doc AUTHORS COPYING README
 %{_bindir}/trrntzip
 
 
 %changelog
-* Wed Apr  4 2012 Matthias Saou <matthias at saou.eu> 0.2-5
+* Wed Apr  4 2012 Matthias Saou <matthias at saou.eu> 0.2-6
 - Minor spec file cleanups.
 - Update license field.
+- Rename patch0 to be more explicit.
 
 * Wed Feb 08 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild


--- patch-src-trrntzip.c DELETED ---