commit unix2dos for openSUSE:Factory

9 Feb 2010

Hello community,

here is the log from the commit of package unix2dos for openSUSE:Factory
checked in at Tue Feb 9 22:13:15 CET 2010.



--------

--- unix2dos/unix2dos.changes	2009-08-26 14:17:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/unix2dos/unix2dos.changes	2010-02-09 17:35:19.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Feb  9 17:27:26 CET 2010 - pth@suse.de
+
+- Update to 4.1.2:
+  This is an update of Benjamin Lin's implementations of dos2unix and
+  unix2dos.  This update includes all RedHat patches and fixes several other
+  problems.  Internationalization has been added and ports to DOS, Windows,
+  Cygwin and OS/2 Warp have been made.
+- Add German translation.
+- Add patch to use DESTDIR only in install target.
+- Use RPM_OPT_FLAGS and do so after all other options.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  unix2dos-2.2-file_mode.patch
  unix2dos-2.2-manpage.patch
  unix2dos-2.2-segfault.patch
  unix2dos-2.2.src.tar.gz
  unix2dos-mkstemp.patch

New:
----
  unix2dos-4.1.2.tar.bz2
  unix2dos-DESTDIR.patch
  unix2dos-RPM_OPT_FLAGS.patch
  unix2dos.de.po.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ unix2dos.spec ++++++
--- /var/tmp/diff_new_pack.COuLIP/_old	2010-02-09 22:12:40.000000000 +0100
+++ /var/tmp/diff_new_pack.COuLIP/_new	2010-02-09 22:12:40.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package unix2dos (Version 2.2)
+# spec file for package unix2dos (Version 4.1.2)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,24 +20,21 @@
 
 Name:           unix2dos
 Summary:        UNIX to DOS text file format converter
-Version:        2.2
-Release:        362
-License:        BSD 3-clause (or similar)
+Version:        4.1.2
+Release:        1
+License:        BSD3c(or similar)
 Group:          Productivity/Text/Convertors
-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-file_mode.patch
+Source:         %{name}-%{version}.tar.bz2
+Source1:        unix2dos.de.po.bz2
+Patch0:         unix2dos-DESTDIR.patch
+Patch1:         unix2dos-RPM_OPT_FLAGS.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %prep
-%setup -q -c
-%patch0 -p1 -b .sec
-%patch1 -p1 -b .segf
-%patch2 -p1 -b .man
-%patch3 -b .fmode
-perl -pi -e "s,^#endif.*,#endif,g;s,^#else.*,#else,g" *.[ch]
+%setup -q
+%patch0
+%patch1
+bzip2 -dc %{S:1} > po/de.po
 
 %description
 Converts plain text files from UNIX format to DOS format.
@@ -47,22 +44,23 @@
 Authors:
 --------
     Benjamin Lin blin @ socs.uts.edu.au
+    Erwin Waterlander waterlan @ xs4all.nl
 
 %build
-gcc %optflags -ounix2dos unix2dos.c
+export RPM_OPT_FLAGS
+make
 
 %install
-mkdir -p %{buildroot}{%{_bindir},%{_mandir}/man1}
-install -m755 unix2dos %{buildroot}%{_bindir}
-install -m444 unix2dos.1 %{buildroot}%{_mandir}/man1
+%makeinstall DOCDIR=%{datadir}/share/doc/packages/%{name}
+%{find_lang} %{name}
 
 %clean
 rm -rf %buildroot
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc COPYRIGHT
+%doc ChangeLog.txt TODO.txt unix2dos.txt COPYING.txt INSTALL.txt README.txt unix2dos.ps
 %{_bindir}/unix2dos
-%{_mandir}/*/*
+%doc %{_mandir}/*/*
 
 %changelog

++++++ unix2dos-DESTDIR.patch ++++++
Index: Makefile
===================================================================
--- Makefile.orig	2010-01-22 13:33:22.000000000 +0100
+++ Makefile	2010-02-09 17:18:44.159967287 +0100
@@ -23,10 +23,10 @@ mandir		= $(man_prefix)/man
 bindir		= $(exec_prefix)/bin
 sharedir	= $(prefix)/share
 
-BINDIR		= $(DESTDIR)$(bindir)
-DOCDIR		= $(DESTDIR)$(sharedir)/doc/$(PACKAGE)-$(UNIX2DOS_VERSION)
-LOCALEDIR	= $(DESTDIR)$(sharedir)/locale
-MANDIR		= $(DESTDIR)$(mandir)
+BINDIR		= $(bindir)
+DOCDIR		= $(sharedir)/doc/$(PACKAGE)-$(UNIX2DOS_VERSION)
+LOCALEDIR	= $(sharedir)/locale
+MANDIR		= $(mandir)
 MANDIR1		= $(MANDIR)/man1
 
 ifdef ENABLE_NLS
@@ -164,27 +164,27 @@ $(PACKAGE).ps : unix2dos.1
 	ps2pdf $< $@
 
 install: all
-	$(MKDIR) -p -m 755 $(BINDIR)
-	$(INSTALL)  -m 755 $(BIN) $(BINDIR)
-	$(MKDIR) -p -m 755 $(MANDIR1)
-	$(INSTALL)  -m 644 $(PACKAGE).1 $(MANDIR1)
+	$(MKDIR) -p -m 755 $(DESTDIR)$(BINDIR)
+	$(INSTALL)  -m 755 	$(BIN) $(DESTDIR)$(BINDIR)
+	$(MKDIR) -p -m 755 $(DESTDIR)$(MANDIR1)
+	$(INSTALL)  -m 644 $(PACKAGE).1 $(DESTDIR)$(MANDIR1)
 ifdef ENABLE_NLS
 	@echo "-- install-mo"
-	$(foreach mofile, $(MOFILES), $(MKDIR) -p -m 755 $(LOCALEDIR)/$(basename $(notdir $(mofile)))/LC_MESSAGES ;)
-	$(foreach mofile, $(MOFILES), $(INSTALL) -m 644 $(mofile) $(LOCALEDIR)/$(basename $(notdir $(mofile)))/LC_MESSAGES/$(PACKAGE).mo ;)
+	$(foreach mofile, $(MOFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(LOCALEDIR)/$(basename $(notdir $(mofile)))/LC_MESSAGES ;)
+	$(foreach mofile, $(MOFILES), $(INSTALL) -m 644 $(mofile) $(DESTDIR)$(LOCALEDIR)/$(basename $(notdir $(mofile)))/LC_MESSAGES/$(PACKAGE).mo ;)
 endif
 	@echo "-- install-doc"
-	$(MKDIR) -p -m 755 $(DOCDIR)
-	$(INSTALL) -m 644 $(INSTALL_OBJS_DOC) $(DOCDIR)
+	$(MKDIR) -p -m 755 $(DESTDIR)$(DOCDIR)
+	$(INSTALL) -m 644 $(INSTALL_OBJS_DOC) $(DESTDIR)$(DOCDIR)
 
 uninstall:
 	@echo "-- target: uninstall"
-	-rm -f $(BINDIR)/$(BIN)
+	-rm -f $(DESTDIR)$(BINDIR)/$(BIN)
 ifdef ENABLE_NLS
-	$(foreach mofile, $(MOFILES), rm -f $(LOCALEDIR)/$(basename $(notdir $(mofile)))/LC_MESSAGES/$(PACKAGE).mo ;)
+	$(foreach mofile, $(MOFILES), rm -f $(DESTDIR)$(LOCALEDIR)/$(basename $(notdir $(mofile)))/LC_MESSAGES/$(PACKAGE).mo ;)
 endif
-	-rm -f $(MANDIR)/man1/$(PACKAGE).1
-	-rm -rf $(DOCDIR)
+	-rm -f $(DESTDIR)$(MANDIR)/man1/$(PACKAGE).1
+	-rm -rf $(DESTDIR)$(DOCDIR)
 
 clean:
 	rm -f *.o
++++++ unix2dos-RPM_OPT_FLAGS.patch ++++++
Index: Makefile
===================================================================
--- Makefile.orig	2010-02-09 17:22:01.000000000 +0100
+++ Makefile	2010-02-09 17:26:31.796448675 +0100
@@ -111,7 +111,8 @@ endif
 
 # ............................................................ flags ...
 
-CFLAGS	= -O2 -Wall -D_LARGEFILE_SOURCE
+CFLAGS	= -O2 -Wall -D_LARGEFILE_SOURCE $(RPM_OPT_FLAGS)
+
 
 EXTRA_CFLAGS	= -DVER_REVISION=\"$(UNIX2DOS_VERSION)\" \
 		  -DVER_DATE=\"$(UNIX2DOS_DATE)\" \

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit unix2dos for openSUSE:Factory

root＠Hilbert.suse.de