[man-pages-pl] - resolves: #823199 updated tarball from the new upstream project - resolves: #842284 file confl

pschiffe pschiffe at fedoraproject.org
Mon Jul 23 18:59:56 UTC 2012


commit a194bc2854ca39a6b9932b1b9e49707b007314c0
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Mon Jul 23 20:59:37 2012 +0200

    - resolves: #823199
      updated tarball from the new upstream project
    - resolves: #842284
      file conflict fixed with update to the new tarball

 .gitignore                    |    2 +-
 man-pages-pl-0.24-pidof.patch |   22 --
 man-pages-pl-sigaction.patch  |  760 -----------------------------------------
 man-pages-pl.spec             |   63 +---
 rm_bogus_links                |   18 -
 sources                       |    2 +-
 6 files changed, 17 insertions(+), 850 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5a4a23a..0c65c6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-man-PL24-10-2005.tar.gz
+/manpages-pl-0.2.tar.bz2
diff --git a/man-pages-pl.spec b/man-pages-pl.spec
index 41dc476..4e20197 100644
--- a/man-pages-pl.spec
+++ b/man-pages-pl.spec
@@ -1,19 +1,13 @@
-%define releasedate 24-10-2005
 Summary: Polish man pages from the Linux Documentation Project
 Name: man-pages-pl
-Version: 0.24
-Release: 14%{?dist}
-# No clear versioning.
+Version: 0.2
+Release: 1%{?dist}
+Epoch: 1
 License: GPL+
 Group: Documentation
-# the source is not available on any public mirror now
-Source: man-PL%{releasedate}.tar.gz
-Source1: rm_bogus_links
-Patch1: man-pages-pl-0.24-pidof.patch
-#Resolves: #701467
-Patch2: man-pages-pl-sigaction.patch
+URL: http://sourceforge.net/projects/manpages-pl/
+Source: http://sourceforge.net/projects/manpages-pl/files/manpages-pl-%{version}.tar.bz2
 Requires: man-pages-reader
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
 %description
@@ -21,53 +15,26 @@ Manual pages from the Linux Documentation Project, translated into
 Polish.
 
 %prep
-%setup -q -n pl_PL
-%patch1 -p1
-%patch2 -p1
-cp %{SOURCE1} ./
+%setup -q -n manpages-pl-%{version}
 
 %build
-# remove man-pages links which link to nothing
-./rm_bogus_links
+# nothing to build
 
 %install
-rm -fr $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/pl/man{1,2,3,4,5,6,7,8,9,n}
-for i in FAQ man[1-8]/*.?; do
-        iconv -f LATIN2 -t UTF-8 < $i > $i.new
-        mv -f $i.new $i
-done
-for i in man[1-8] ; do 
-    install -m 644 $i/*.? $RPM_BUILD_ROOT%{_mandir}/pl/$i; 
-done
-rm -f $RPM_BUILD_ROOT/%{_mandir}/pl/man8/rpm*
-
-# too buggy to ship... not only errors, but also things which
-# obviously don't work as the author intended
-rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man5/lisp-tut*
-
-rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man1/newgrp.1*
-rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man1/{apropos.1,chage.1,gendiff.1,gpasswd.1,man.1,mplayer.1,sg.1,whatis.1}*
-rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man1/{evim,ex,rview,rvim,view,vim,vimdiff,vimtutor}.1*
-rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man5/{faillog.5,shadow.5,man.config.5,qmail-*.5,dot-qmail.5}*
-rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man7/qmail.7*
-rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man8/{grpunconv.8,faillog.8,newusers.8,rpmcache.8,rpm2cpio.8,rpmdeps.8,rpm.8,rpmbuild.8,rpmgraph.8,pwconv.8,lastlog.8,stunnel.8,pwck.8,grpck.8,chpasswd.8,grpconv.8,adduser.8,pwunconv.8,groupadd.8,groupdel.8,groupmod.8,useradd.8,userdel.8,usermod.8,qmail}*
-
-rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man1/mc.1*
-
-# Part of shadow-utils
-rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man5/login.defs.5*
-rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man8/groupmems.8*
-
-%clean
-rm -fr $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc FAQ
+%doc AUTHORS CHANGELOG COPYRIGHT README VERSION licences
 %{_mandir}/pl/man*/*
 
 %changelog
+* Mon Jul 23 2012 Peter Schiffer <pschiffe at redhat.com> - 1:0.2-1
+- resolves: #823199
+  updated tarball from the new upstream project
+- resolves: #842284
+  file conflict fixed with update to the new tarball
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index ff48043..4b26bb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53dbc41853d166e7e96d7f8054015adc  man-PL24-10-2005.tar.gz
+cb32bd44a720a1107804550e51fab6bf  manpages-pl-0.2.tar.bz2


More information about the scm-commits mailing list