OBS User unknown 2008-09-15 12:05:45 +00:00 committed by Git OBS Bridge
parent f9390d74d3
commit ca5f921171
3 changed files with 42 additions and 11 deletions

14
dos2unix-hardlink.patch Normal file
View File

@ -0,0 +1,14 @@
--- 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 15 14:04:46 CEST 2008 - ro@suse.de
- let mac2unix be a hardlink (instead of duplicate binary)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 11 12:12:57 CEST 2006 - pth@suse.de Tue Apr 11 12:12:57 CEST 2006 - pth@suse.de

View File

@ -1,25 +1,34 @@
# #
# spec file for package dos2unix (Version 3.1) # spec file for package dos2unix (Version 3.1)
# #
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
# #
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild # norootforbuild
Name: dos2unix Name: dos2unix
Summary: A DOS to UNIX Text Converter Summary: A DOS to UNIX Text Converter
Version: 3.1 Version: 3.1
Release: 313 Release: 437
Group: Productivity/Text/Convertors Group: Productivity/Text/Convertors
License: Other License(s), see package, distributable License: BSD 3-Clause
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Patch0: %{name}-%{version}.patch Patch0: %{name}-%{version}.patch
Patch1: dos2unix-3.1-segfault.patch Patch1: dos2unix-3.1-segfault.patch
Patch2: dos2unix-3.1-preserve-file-modes.patch Patch2: dos2unix-3.1-preserve-file-modes.patch
Patch3: dos2unix-hardlink.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -37,6 +46,7 @@ Authors:
%patch0 -p1 -b .orig %patch0 -p1 -b .orig
%patch1 -p1 -b .segf %patch1 -p1 -b .segf
%patch2 -b .fmode %patch2 -b .fmode
%patch3 -b .fmode
perl -pi -e 's,(#endif|#else)[^ ]*(.*),$1 /* $2 */,g' *.[ch] perl -pi -e 's,(#endif|#else)[^ ]*(.*),$1 /* $2 */,g' *.[ch]
%build %build
@ -62,14 +72,16 @@ install -m444 mac2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%changelog -n dos2unix %changelog
* Tue Apr 11 2006 - pth@suse.de * Mon Sep 15 2008 ro@suse.de
- let mac2unix be a hardlink (instead of duplicate binary)
* Tue Apr 11 2006 pth@suse.de
- Make dos2unix preserve file modes (bugzilla #119350). - Make dos2unix preserve file modes (bugzilla #119350).
* Wed Jan 25 2006 - mls@suse.de * Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Wed Oct 05 2005 - dmueller@suse.de * Wed Oct 05 2005 dmueller@suse.de
- add norootforbuild - add norootforbuild
* Mon Aug 12 2002 - bk@suse.de * Mon Aug 12 2002 bk@suse.de
- update to dos2unix-3.1(no longer uses hd2u, but real dos2unix) - update to dos2unix-3.1(no longer uses hd2u, but real dos2unix)
* Wed Jun 19 2002 - postadal@suse.cz * Wed Jun 19 2002 postadal@suse.cz
- new package dos2unix verison 0.8.0 - new package dos2unix verison 0.8.0