- updated to 0.49

diff --git a/moreutils.spec b/moreutils.spec
index 21f227216f66fd4ff2bc245adc347c991bf189b3..3e3cbd9d196adddc20c34addada4acb5ec446bd2 100644 (file)
--- a/moreutils.spec
+++ b/moreutils.spec
@@ -1,18 +1,17 @@
-# TODO:
-# - Subpackage each tool?
 Summary:       A collection of unix tools
 Summary(pl.UTF-8):     Zestaw narzędzi uniksowych
 Name:          moreutils
-Version:       0.46
+Version:       0.49
 Release:       1
-License:       GPL v2
+License:       GPL v2+
 Group:         Applications/System
 Source0:       http://ftp.debian.org/debian/pool/main/m/moreutils/%{name}_%{version}.tar.gz
-# Source0-md5: 658f9cc6b6dcc0b50dcff714e13b22dc
+# Source0-md5: 29b49e70fec35b28df24b25eb3e0fd29
 Patch0:                %{name}-make.patch
 URL:           http://joeyh.name/code/moreutils/
 BuildRequires: docbook-dtd44-sgml
 BuildRequires: docbook2X
+BuildRequires: sed >= 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -21,6 +20,7 @@ unix was young. Currently it consists of these tools:
 
  - chronic: runs a command quietly unless it fails
  - ccombine: combine the lines in two files using boolean operations
+ - errno: look up errno names and descriptions
  - ifdata: get network interface info without parsing ifconfig output
  - isutf8: check if a file or standard input is utf-8
  - ifne: run a command if the standard input is not empty
@@ -42,6 +42,7 @@ narzędzia:
  - chronic: ciche uruchomienie polecenia, jeśli nie ma błędu
  - ccombine: łączenie linii z dwóch plików przy użyciu operacji
    logicznych
+ - errno: wyszukiwanie nazw i opisów errno
  - ifdata: pobieranie informacji o interfejsie bez analizy wyjścia
    ifconfiga
  - isutf8: sprawdzenie, czy lub standardowe wejście jest w UTF-8
@@ -62,25 +63,32 @@ narzędzia:
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-%{__sed} -i -e '/"file:\/\/\/.*docbookx\.dtd"/d' *docbook
-%{__sed} -i -e '/xml version="1.0" encoding="utf-8"/d' *docbook
+
+# adjust paths to PLD
+%{__sed} -i -e 's,"file:///.*docbookx\.dtd","/usr/share/sgml/docbook/xml-dtd-4.4/docbookx.dtd",' *.docbook
 
 %build
-%{__make}
+%{__make} \
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags} -Wall" \
+       DOCBOOK2XMAN=docbook2X2man
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       INSTALL_BIN=install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README COPYING
+%doc README debian/changelog
 %attr(755,root,root) %{_bindir}/chronic
 %attr(755,root,root) %{_bindir}/combine
+%attr(755,root,root) %{_bindir}/errno
 %attr(755,root,root) %{_bindir}/ifdata
 %attr(755,root,root) %{_bindir}/ifne
 %attr(755,root,root) %{_bindir}/isutf8
@@ -93,4 +101,18 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/vidir
 %attr(755,root,root) %{_bindir}/vipe
 %attr(755,root,root) %{_bindir}/zrun
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/chronic.1*
+%{_mandir}/man1/combine.1*
+%{_mandir}/man1/errno.1*
+%{_mandir}/man1/ifdata.1*
+%{_mandir}/man1/ifne.1*
+%{_mandir}/man1/isutf8.1*
+%{_mandir}/man1/lckdo.1*
+%{_mandir}/man1/mispipe.1*
+%{_mandir}/man1/parallel.1*
+%{_mandir}/man1/pee.1*
+%{_mandir}/man1/sponge.1*
+%{_mandir}/man1/ts.1*
+%{_mandir}/man1/vidir.1*
+%{_mandir}/man1/vipe.1*
+%{_mandir}/man1/zrun.1*