Fri Jan 22 10:41:31 UTC 2010

Author: twaugh

Update of /cvs/pkgs/rpms/dos2unix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7637

Modified Files:
	.cvsignore dos2unix-preserve-file-modes.patch dos2unix.spec 
	sources 
Added Files:
	dos2unix-CFLAGS.patch 
Removed Files:
	dos2unix-3.1-manpage-update-57507.patch 
	dos2unix-3.1-preserve-file-modes.patch 
	dos2unix-3.1-safeconv.patch dos2unix-3.1-segfault.patch 
	dos2unix-3.1-tmppath.patch dos2unix-3.1.patch 
	dos2unix-c-missing-arg.patch dos2unix-manpage.patch 
	dos2unix-missing-proto.patch 
Log Message:
* Fri Jan 22 2010 Tim Waugh <twaugh at redhat.com> 4.1.1-1
- 4.1.1.  New upstream.


dos2unix-CFLAGS.patch:
 Makefile |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE dos2unix-CFLAGS.patch ---
diff -up dos2unix-4.1.1/Makefile.CFLAGS dos2unix-4.1.1/Makefile
--- dos2unix-4.1.1/Makefile.CFLAGS	2010-01-22 10:00:01.207058452 +0000
+++ dos2unix-4.1.1/Makefile	2010-01-22 10:01:15.224057831 +0000
@@ -116,15 +116,14 @@ endif
 
 # ............................................................ flags ...
 
-GCCFLAGS	= -O2 -Wall -D_LARGEFILE_SOURCE
+CFLAGS	= -O2 -Wall -D_LARGEFILE_SOURCE
 
 ifdef STATIC
 	GCCFLAGS += -static
 endif
 
-CFLAGS		= -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
+EXTRA_CFLAGS	= -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
 		  -DVER_DATE=\"$(DOS2UNIX_DATE)\" \
-		  $(GCCFLAGS) \
 		  $(CFLAGS_OS) \
 		  $(NLSDEFS)
 
@@ -138,7 +137,7 @@ DEFS		= $(EXTRA_DEFS)
 all: $(BIN) $(MAC2UNIX_BIN) $(MAC2UNIX).1 $(DOCFILES) $(MOFILES)
 
 %.o : %.c
-	$(CC) $(CFLAGS) $(DEFS) -c $< -o $@
+	$(CC) $(EXTRA_CFLAGS) $(CFLAGS) $(DEFS) -c $< -o $@
 
 $(BIN): dos2unix.o
 	$(CC) $< $(LDFLAGS) -o $@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dos2unix/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Sep 2004 04:19:07 -0000	1.2
+++ .cvsignore	22 Jan 2010 10:41:31 -0000	1.3
@@ -1 +1,2 @@
 dos2unix-3.1.tar.bz2
+dos2unix-4.1.1.tar.gz

dos2unix-preserve-file-modes.patch:
 dos2unix.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Index: dos2unix-preserve-file-modes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dos2unix/devel/dos2unix-preserve-file-modes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dos2unix-preserve-file-modes.patch	8 Sep 2008 09:17:56 -0000	1.1
+++ dos2unix-preserve-file-modes.patch	22 Jan 2010 10:41:31 -0000	1.2
@@ -1,19 +1,24 @@
-diff -up dos2unix-3.1/dos2unix.c.preserve-file-modes dos2unix-3.1/dos2unix.c
---- dos2unix-3.1/dos2unix.c.preserve-file-modes	2008-09-08 09:58:05.000000000 +0100
-+++ dos2unix-3.1/dos2unix.c	2008-09-08 10:16:04.000000000 +0100
-@@ -320,9 +320,10 @@ int ConvertDosToUnixNewFile(char *ipInFN
+diff -up dos2unix-4.1.1/dos2unix.c.preserve-file-modes dos2unix-4.1.1/dos2unix.c
+--- dos2unix-4.1.1/dos2unix.c.preserve-file-modes	2010-01-10 21:02:18.000000000 +0000
++++ dos2unix-4.1.1/dos2unix.c	2010-01-22 09:55:48.870058072 +0000
+@@ -472,6 +472,7 @@ int ConvertDosToUnixNewFile(char *ipInFN
+   char *TempPath;
    struct stat StatBuf;
    struct utimbuf UTimeBuf;
-   int fd;
 +  mode_t mask;
+ #ifdef NO_MKSTEMP
+   FILE* fd;
+ #else
+@@ -487,7 +488,7 @@ int ConvertDosToUnixNewFile(char *ipInFN
+     ipFlag->status = 0 ;
  
    /* retrieve ipInFN file date stamp */
 -  if ((ipFlag->KeepDate) && stat(ipInFN, &StatBuf))
 +  if (stat(ipInFN, &StatBuf))
      RetVal = -1;
  
-   if((fd = MakeTempFileFrom(ipOutFN, &TempPath))<0) {
-@@ -346,6 +347,12 @@ int ConvertDosToUnixNewFile(char *ipInFN
+ #ifdef NO_MKSTEMP
+@@ -519,6 +520,12 @@ int ConvertDosToUnixNewFile(char *ipInFN
      RetVal = -1;
    }
  


Index: dos2unix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dos2unix/devel/dos2unix.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- dos2unix.spec	24 Jul 2009 20:28:25 -0000	1.36
+++ dos2unix.spec	22 Jan 2010 10:41:31 -0000	1.37
@@ -1,23 +1,17 @@
 Summary: Text file format converter
 Name: dos2unix
-Version: 3.1
-Release: 36%{?dist}
+Version: 4.1.1
+Release: 1%{?dist}
 Group: Applications/Text
 License: BSD
 
-# There is no upstream for this.
-Source: %{name}-%{version}.tar.bz2
+Url: http://www.xs4all.nl/~waterlan/dos2unix.html
+Source: http://www.xs4all.nl/~waterlan/dos2unix/%{name}-%{version}.tar.gz
 
-Patch0: %{name}-%{version}.patch
-Patch1: dos2unix-3.1-segfault.patch
-Patch2: dos2unix-3.1-safeconv.patch
-Patch3: dos2unix-3.1-manpage-update-57507.patch
-Patch4: dos2unix-3.1-preserve-file-modes.patch
-Patch5: dos2unix-3.1-tmppath.patch
-Patch6: dos2unix-c-missing-arg.patch
-Patch7: dos2unix-missing-proto.patch
-Patch8: dos2unix-manpage.patch
-Patch9: dos2unix-preserve-file-modes.patch
+BuildRequires: gettext
+
+Patch1: dos2unix-preserve-file-modes.patch
+Patch2: dos2unix-CFLAGS.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,39 +20,20 @@ Dos2unix converts DOS or MAC text files 
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
-%patch1 -p1 -b .segfault
-%patch2 -p1 -b .safeconv
-%patch3 -p1 -b .manpage-update-57507
-%patch4 -p1 -b .preserve-file-modes
-%patch5 -p1 -b .tmppath
-%patch6 -p1 -b .c-missing-arg
-%patch7 -p1 -b .missing-proto
-%patch8 -p1 -b .manpage
-%patch9 -p1 -b .preserve-file-modes
-
-for I in *.[ch]; do
-	sed -e 's,#endif.*,#endif,g' -e 's,#else.*,#else,g' $I > $I.new
-	mv -f $I.new $I
-done
-make clean
+%patch1 -p1 -b .preserve-file-modes
+%patch2 -p1 -b .CFLAGS
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE $(getconf LFS_CFLAGS)" \
   %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} install
+%find_lang %{name}
 
-mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
-install -p -m755 dos2unix $RPM_BUILD_ROOT%{_bindir}
-ln -s dos2unix $RPM_BUILD_ROOT%{_bindir}/mac2unix
-install -p -m644 dos2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1
-ln -s dos2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1/mac2unix.1
-
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc COPYRIGHT
+%doc COPYING.txt
 %{_bindir}/dos2unix
 %{_bindir}/mac2unix
 %{_mandir}/*/*
@@ -67,6 +42,9 @@ ln -s dos2unix.1 $RPM_BUILD_ROOT%{_mandi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jan 22 2010 Tim Waugh <twaugh at redhat.com> 4.1.1-1
+- 4.1.1.  New upstream.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-36
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dos2unix/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Sep 2004 04:19:07 -0000	1.2
+++ sources	22 Jan 2010 10:41:31 -0000	1.3
@@ -1 +1 @@
-f90026a397cf787083ec2e4892c6dcdd  dos2unix-3.1.tar.bz2
+d06f398d1a91d8f02604fa57166d4c44  dos2unix-4.1.1.tar.gz


--- dos2unix-3.1-manpage-update-57507.patch DELETED ---


--- dos2unix-3.1-preserve-file-modes.patch DELETED ---


--- dos2unix-3.1-safeconv.patch DELETED ---


--- dos2unix-3.1-segfault.patch DELETED ---


--- dos2unix-3.1-tmppath.patch DELETED ---


--- dos2unix-3.1.patch DELETED ---


--- dos2unix-c-missing-arg.patch DELETED ---


--- dos2unix-manpage.patch DELETED ---


--- dos2unix-missing-proto.patch DELETED ---

