From f763b61adf212d73c8b8cccde0369baf01d5748e4386305989118327140c02b6 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Dec 2008 11:26:45 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dos2unix?expand=0&rev=3 --- dos2unix-hardlink.patch | 14 -------------- dos2unix.changes | 5 +++++ dos2unix.spec | 12 +++++------- 3 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 dos2unix-hardlink.patch diff --git a/dos2unix-hardlink.patch b/dos2unix-hardlink.patch deleted file mode 100644 index 1b1358e..0000000 --- a/dos2unix-hardlink.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile -+++ Makefile -@@ -10,8 +10,9 @@ - - - link: -- ln -s dos2unix mac2unix -- ln -s dos2unix.1 mac2unix.1 -+ rm -f mac2unix mac2unix.1 -+ ln -f dos2unix mac2unix -+ ln -f dos2unix.1 mac2unix.1 - - clean: - rm -f dos2unix mac2unix mac2unix.1 *~ *.orig core diff --git a/dos2unix.changes b/dos2unix.changes index 9af5427..6737b3d 100644 --- a/dos2unix.changes +++ b/dos2unix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 9 17:10:36 CET 2008 - schwab@suse.de + +- Fix last change. + ------------------------------------------------------------------- Mon Sep 15 14:04:46 CEST 2008 - ro@suse.de diff --git a/dos2unix.spec b/dos2unix.spec index 80db8ba..81498be 100644 --- a/dos2unix.spec +++ b/dos2unix.spec @@ -15,20 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: dos2unix Summary: A DOS to UNIX Text Converter Version: 3.1 -Release: 437 +Release: 438 Group: Productivity/Text/Convertors License: BSD 3-Clause Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}.patch Patch1: dos2unix-3.1-segfault.patch Patch2: dos2unix-3.1-preserve-file-modes.patch -Patch3: dos2unix-hardlink.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,7 +44,6 @@ Authors: %patch0 -p1 -b .orig %patch1 -p1 -b .segf %patch2 -b .fmode -%patch3 -b .fmode perl -pi -e 's,(#endif|#else)[^ ]*(.*),$1 /* $2 */,g' *.[ch] %build @@ -55,12 +52,11 @@ make CFLAGS="$RPM_OPT_FLAGS" make link %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} install -m755 dos2unix $RPM_BUILD_ROOT%{_bindir} -install -m755 mac2unix $RPM_BUILD_ROOT%{_bindir} +ln -s dos2unix $RPM_BUILD_ROOT%{_bindir}/mac2unix install -m444 dos2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1 -install -m444 mac2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1 +ln -s dos2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1/mac2unix.1 %files %defattr(-,root,root,0755) @@ -73,6 +69,8 @@ install -m444 mac2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1 rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 09 2008 schwab@suse.de +- Fix last change. * Mon Sep 15 2008 ro@suse.de - let mac2unix be a hardlink (instead of duplicate binary) * Tue Apr 11 2006 pth@suse.de