diff --git a/Makefile b/Makefile deleted file mode 100644 index 9b2f6a3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: man-pages-cs -# $Id$ -NAME := man-pages-cs -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/man-pages-cs-0.17-noMANDIR.patch b/man-pages-cs-0.17-noMANDIR.patch deleted file mode 100644 index f4a925f..0000000 --- a/man-pages-cs-0.17-noMANDIR.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up man-pages-cs-0.17.20080113/inst.sh.pom man-pages-cs-0.17.20080113/inst.sh ---- man-pages-cs-0.17.20080113/inst.sh.pom 2008-01-14 00:43:50.000000000 +0100 -+++ man-pages-cs-0.17.20080113/inst.sh 2008-01-15 10:42:19.000000000 +0100 -@@ -1,5 +1,5 @@ - #!/bin/sh --MANDIR=/usr/share/man/cs -+[ -z "$MANDIR" ] && MANDIR=/usr/share/man/cs - for i in latest/man? - do - cislosekce=${i: -1} diff --git a/man-pages-cs.spec b/man-pages-cs.spec index e8b44dd..59405b4 100644 --- a/man-pages-cs.spec +++ b/man-pages-cs.spec @@ -1,25 +1,28 @@ -%define coreutils_version 20081218 Summary: Czech man pages from the Linux Documentation Project Name: man-pages-cs Version: 0.18.20090209 -Release: 14%{?dist} -License: GFDL and GPL+ +Release: 15%{?dist} +# GPLv3 .. coreutils/ +# BSD .. openssh/ +License: GPLv2 and GPLv3 and BSD Group: Documentation URL: http://tropikhajma.sweb.cz/man-pages-cs/ Source: http://tropikhajma.sweb.cz/%{name}/%{name}-%{version}.tar.lzma -Patch1: man-pages-cs-01.patch -Patch2: man-pages-cs-02.patch -Patch3: man-pages-cs-03.patch -Patch4: man-pages-cs-04.patch -Patch5: man-pages-cs-05.patch -Patch6: man-pages-cs-06.patch -Patch7: man-pages-cs-07.patch -Patch8: man-pages-cs-08.patch -Patch9: man-pages-cs-09.patch + +Patch1: man-pages-cs-01.patch +Patch2: man-pages-cs-02.patch +Patch3: man-pages-cs-03.patch +Patch4: man-pages-cs-04.patch +Patch5: man-pages-cs-05.patch +Patch6: man-pages-cs-06.patch +Patch7: man-pages-cs-07.patch +Patch8: man-pages-cs-08.patch +Patch9: man-pages-cs-09.patch Patch10: man-pages-cs-10.patch Patch11: man-pages-cs-11.patch Patch12: man-pages-cs-0.18.20090209-socket.patch Patch13: man-pages-cs-0.18.20090209-test.patch + Requires: man-pages-reader BuildArch: noarch @@ -57,11 +60,13 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir} make install DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}/cs %files -%defattr(-,root,root,-) -%doc CONTRIB README README.Czech +%doc CONTRIB README README.Czech Changelog %{_mandir}/cs/man*/* %changelog +* Wed Aug 29 2012 Peter Schiffer - 0.18.20090209-15 +- .spec file cleanup + * Thu Jul 26 2012 Peter Schiffer - 0.18.20090209-14 - resolves: #821661 fixed typo in the test.1 man page