Author: qboosh Date: Sat Nov 13 06:08:47 2010 GMT Module: packages Tag: HEAD ---- Log message: - removed obsolete manpage-update,workaround-rename-EXDEV patches - pass __cc/rpmcflags/rpmcppflags/rpmldflags - package nl manpages - License is BSD
---- Files affected: packages/dos2unix: dos2unix.spec (1.23 -> 1.24) , dos2unix-manpage-update.patch (1.2 -> NONE) (REMOVED), dos2unix-workaround-rename-EXDEV.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/dos2unix/dos2unix.spec diff -u packages/dos2unix/dos2unix.spec:1.23 packages/dos2unix/dos2unix.spec:1.24 --- packages/dos2unix/dos2unix.spec:1.23 Fri Nov 12 17:06:05 2010 +++ packages/dos2unix/dos2unix.spec Sat Nov 13 07:08:42 2010 @@ -9,14 +9,13 @@ Name: dos2unix Version: 5.1.1 Release: 1 -License: Freer than LGPL +License: BSD Group: Applications/Text Source0: http://www.xs4all.nl/~waterlan/dos2unix/%{name}-%{version}.tar.gz # Source0-md5: b8f6d8109fc6decf412bc1e3959450c0 +Patch0: %{name}-includes.patch URL: http://www.xs4all.nl/~waterlan/dos2unix.html -Patch2: %{name}-includes.patch -Patch3: %{name}-manpage-update.patch -Patch6: %{name}-workaround-rename-EXDEV.patch +Provides: unix2dos Obsoletes: unix2dos BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -43,22 +42,23 @@ %prep %setup -q -%patch2 -p1 -#%patch3 -p1 -#%patch6 -p1 +%patch0 -p1 %build -%{__make} +%{__make} \ + CC="%{__cc}" \ + RPM_OPT_FLAGS="%{rpmcflags} %{rpmcppflags}" \ + LDFLAGS="%{rpmldflags}" %install rm -rf $RPM_BUILD_ROOT + %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# dos2unix and unix2dos domains %find_lang %{name} --all-name -find $RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT @@ -69,7 +69,14 @@ %attr(755,root,root) %{_bindir}/mac2unix %attr(755,root,root) %{_bindir}/unix2dos %attr(755,root,root) %{_bindir}/unix2mac -%{_mandir}/man1/* +%{_mandir}/man1/dos2unix.1* +%{_mandir}/man1/mac2unix.1* +%{_mandir}/man1/unix2dos.1* +%{_mandir}/man1/unix2mac.1* +%lang(nl) %{_mandir}/nl/man1/dos2unix.1* +%lang(nl) %{_mandir}/nl/man1/mac2unix.1* +%lang(nl) %{_mandir}/nl/man1/unix2dos.1* +%lang(nl) %{_mandir}/nl/man1/unix2mac.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -77,6 +84,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.24 2010/11/13 06:08:42 qboosh +- removed obsolete manpage-update,workaround-rename-EXDEV patches +- pass __cc/rpmcflags/rpmcppflags/rpmldflags +- package nl manpages +- License is BSD + Revision 1.23 2010/11/12 16:06:05 caleb - Up to 5.1.1 - Obsoletes separate unix2dos package ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dos2unix/dos2unix.spec?r1=1.23&r2=1.24&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
