rpms/unix2dos/devel unix2dos-CFLAGS.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 unix2dos-preserve-file-modes.patch, 1.1, 1.2 unix2dos.spec, 1.33, 1.34 unix2dos-2.2-manpage.patch, 1.2, NONE unix2dos-2.2-mode.patch, 1.2, NONE unix2dos-2.2-segfault.patch, 1.1, NONE unix2dos-2.2-tmppath.patch, 1.3, NONE unix2dos-mkstemp.patch, 1.1, NONE

[Tim Waugh]

Author: twaugh

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

Modified Files:
	.cvsignore sources unix2dos-preserve-file-modes.patch 
	unix2dos.spec 
Added Files:
	unix2dos-CFLAGS.patch 
Removed Files:
	unix2dos-2.2-manpage.patch unix2dos-2.2-mode.patch 
	unix2dos-2.2-segfault.patch unix2dos-2.2-tmppath.patch 
	unix2dos-mkstemp.patch 
Log Message:
* Fri Jan 22 2010 Tim Waugh <twaugh at redhat.com> - 4.1.1-1
- 4.1.1.  New upstream.


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

--- NEW FILE unix2dos-CFLAGS.patch ---
diff -up unix2dos-4.1.1/Makefile.CFLAGS unix2dos-4.1.1/Makefile
--- unix2dos-4.1.1/Makefile.CFLAGS	2009-12-28 13:49:53.000000000 +0000
+++ unix2dos-4.1.1/Makefile	2010-01-22 10:33:15.807049723 +0000
@@ -111,15 +111,14 @@ endif
 
 # ............................................................ flags ...
 
-GCCFLAGS	= -O2 -Wall -D_LARGEFILE_SOURCE
+CFLAGS	= -O2 -Wall -D_LARGEFILE_SOURCE
 
 ifdef STATIC
 	GCCFLAGS += -static
 endif
 
-CFLAGS		= -DVER_REVISION=\"$(UNIX2DOS_VERSION)\" \
+EXTRA_CFLAGS	= -DVER_REVISION=\"$(UNIX2DOS_VERSION)\" \
 		  -DVER_DATE=\"$(UNIX2DOS_DATE)\" \
-		  $(GCCFLAGS) \
 		  $(CFLAGS_OS) \
 		  $(NLSDEFS)
 
@@ -133,7 +132,7 @@ DEFS		= $(EXTRA_DEFS)
 all: $(BIN) $(DOCFILES) $(MOFILES)
 
 %.o : %.c
-	$(CC) $(CFLAGS) $(DEFS) -c $< -o $@
+	$(CC) $(EXTRA_CFLAGS) $(CFLAGS) $(DEFS) -c $< -o $@
 
 $(BIN): unix2dos.o
 	$(CC) $< $(LDFLAGS) -o $@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Sep 2004 13:44:51 -0000	1.2
+++ .cvsignore	22 Jan 2010 10:41:47 -0000	1.3
@@ -1 +1,2 @@
 unix2dos-2.2.src.tar.gz
+unix2dos-4.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Sep 2004 13:44:51 -0000	1.2
+++ sources	22 Jan 2010 10:41:47 -0000	1.3
@@ -1 +1 @@
-e4488c241fa9067a48a7534a21d4babb  unix2dos-2.2.src.tar.gz
+6abf8be34def111286918c599a53a73c  unix2dos-4.1.1.tar.gz

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

Index: unix2dos-preserve-file-modes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos-preserve-file-modes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- unix2dos-preserve-file-modes.patch	8 Sep 2008 08:57:00 -0000	1.1
+++ unix2dos-preserve-file-modes.patch	22 Jan 2010 10:41:47 -0000	1.2
@@ -1,20 +1,24 @@
-diff -up unix2dos-2.2/unix2dos.c~ unix2dos-2.2/unix2dos.c
---- unix2dos-2.2/unix2dos.c~	2008-03-03 13:16:34.000000000 +0000
-+++ unix2dos-2.2/unix2dos.c	2008-03-03 13:22:10.000000000 +0000
-@@ -244,10 +244,11 @@ int ConvertUnixToDosNewFile(char *ipInFN
+diff -up unix2dos-4.1.1/unix2dos.c.preserve-file-modes unix2dos-4.1.1/unix2dos.c
+--- unix2dos-4.1.1/unix2dos.c.preserve-file-modes	2010-01-10 21:02:18.000000000 +0000
++++ unix2dos-4.1.1/unix2dos.c	2010-01-22 10:29:46.193058169 +0000
+@@ -389,6 +389,7 @@ int ConvertUnixToDosNewFile(char *ipInFN
    char *TempPath;
    struct stat StatBuf;
    struct utimbuf UTimeBuf;
 +  mode_t mask;
-   int fd;
+ #ifdef NO_MKSTEMP
+   FILE* fd;
+ #else
+@@ -404,7 +405,7 @@ int ConvertUnixToDosNewFile(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) {
-@@ -271,6 +272,12 @@ int ConvertUnixToDosNewFile(char *ipInFN
+ #ifdef NO_MKSTEMP
+@@ -436,6 +437,12 @@ int ConvertUnixToDosNewFile(char *ipInFN
      RetVal = -1;
    }
  


Index: unix2dos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- unix2dos.spec	27 Jul 2009 06:33:45 -0000	1.33
+++ unix2dos.spec	22 Jan 2010 10:41:47 -0000	1.34
@@ -1,51 +1,46 @@
 Summary: UNIX to DOS text file format converter
 Name: unix2dos
-Version: 2.2
-Release: 34%{?dist}
+Version: 4.1.1
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Text
-Source: unix2dos-2.2.src.tar.gz
-Patch0: unix2dos-mkstemp.patch
-Patch1: unix2dos-2.2-segfault.patch
-Patch2: unix2dos-2.2-manpage.patch
-Patch3: unix2dos-2.2-mode.patch
-Patch4: unix2dos-2.2-tmppath.patch
-Patch5: unix2dos-preserve-file-modes.patch
+Url: http://www.xs4all.nl/~waterlan/dos2unix.html
+Source: http://www.xs4all.nl/~waterlan/unix2dos/%{name}-%{version}.tar.gz
+BuildRequires: gettext
+Patch1: unix2dos-preserve-file-modes.patch
+Patch2: unix2dos-CFLAGS.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %prep
-%setup -q -c
-%patch0 -p1 -b .sec
-%patch1 -p1 -b .segf
-%patch2 -p1 -b .man
-%patch3 -p1 -b .mode
-%patch4 -p1 -b .tmppath
-%patch5 -p1 -b .preserve-file-modes
-perl -pi -e "s/^#endif.*/#endif/g;s/^#else.*/#else/g" *.[ch]
+%setup -q
+%patch1 -p1 -b .preserve-file-modes
+%patch2 -p1 -b .CFLAGS
 
 %description
 A utility that converts plain text files in UNIX format to DOS format.
 
 %build
-gcc $RPM_OPT_FLAGS -o unix2dos unix2dos.c
+make CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE $(getconf LFS_CFLAGS)" \
+  %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
-install -p -m755 unix2dos $RPM_BUILD_ROOT%{_bindir}
-install -p -m444 unix2dos.1 $RPM_BUILD_ROOT%{_mandir}/man1
+make DESTDIR=%{buildroot} install
+%find_lang %{name}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc COPYRIGHT
+%doc COPYING.txt
 %{_bindir}/unix2dos
 %{_mandir}/*/*
 
 
 %changelog
+* Fri Jan 22 2010 Tim Waugh <twaugh at redhat.com> - 4.1.1-1
+- 4.1.1.  New upstream.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-34
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- unix2dos-2.2-manpage.patch DELETED ---


--- unix2dos-2.2-mode.patch DELETED ---


--- unix2dos-2.2-segfault.patch DELETED ---


--- unix2dos-2.2-tmppath.patch DELETED ---


--- unix2dos-mkstemp.patch DELETED ---