OBS User unknown 2008-12-15 11:26:45 +00:00 committed by Git OBS Bridge
parent ca5f921171
commit f763b61adf
3 changed files with 10 additions and 21 deletions

View File

@ -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

View File

@ -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

View File

@ -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