[lrzip] 0.600 bump

Wed Mar 23 16:47:15 UTC 2011

commit befb09e1e5f60c1c692fc54a26836fe667e882a7
Author: Petr Písař <ppisar at redhat.com>
Date:   Wed Mar 23 17:46:25 2011 +0100

    0.600 bump
    
    Regressions in packaging acknowledged by upstream.

 .gitignore                                    |    1 +
 lrzip-0.600-Generate-manual-from-POD.patch    |   47 +++++++++++++++++++++++++
 lrzip-0.600-Install-un-packing-symlinks.patch |   24 +++++++++++++
 lrzip.spec                                    |   34 +++++++++++++++---
 sources                                       |    2 +-
 5 files changed, 102 insertions(+), 6 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index caa009d..eaed548 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ lrzip-0.46.tar.bz2
 /lrzip-0.560.tar.bz2
 /lrzip-0.570.tar.bz2
 /lrzip-0.571.tar.bz2
+/lrzip-0.600.tar.bz2
diff --git a/lrzip-0.600-Generate-manual-from-POD.patch b/lrzip-0.600-Generate-manual-from-POD.patch
new file mode 100644
index 0000000..861af8e
--- /dev/null
+++ b/lrzip-0.600-Generate-manual-from-POD.patch
@@ -0,0 +1,47 @@
+From bd6e3f466d7773e02af5bb4ae9815c614bb9f669 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 23 Mar 2011 16:07:36 +0100
+Subject: [PATCH] Generate manual from POD
+
+---
+ configure.ac    |    4 ++++
+ man/Makefile.am |    9 ++++++++-
+ 2 files changed, 12 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e34b005..9b69797 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,10 @@ AC_PROG_LN_S
+ AC_SUBST(SHELL)
+ AC_SYS_LARGEFILE
+ 
++AC_CHECK_PROG([HAVE_POD2MAN], [pod2man], [yes])
++AS_IF([test "$HAVE_POD2MAN" != "yes"],
++      AC_MSG_FAILURE([pod2man is needed to generate manual from POD]))
++
+ AC_ARG_ENABLE(
+ 		asm,
+ 		[AC_HELP_STRING([--enable-asm],[Enable native Assembly code])],
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 51b754a..b5068fb 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -1,6 +1,13 @@
+ MAINTAINERCLEANFILES = Makefile.in lrunzip.1 lrztar.1 lrzuntar.1
+ 
+-man1_MANS = lrzip.1 lrunzip.1.pod lrztar.1.pod lrzuntar.1.pod
++man1_MANS = lrzip.1 lrunzip.1 lrztar.1 lrzuntar.1
+ man5_MANS = lrzip.conf.5
+ 
++lrunzip.1_SRC = lrunzip.1.pod
++lrztar.1_SRC = lrztar.1.pod
++lrzuntar.1_SRC = lrzuntar.1.pod
++
++%: %.pod
++	pod2man $< > $@
++
+ EXTRA_DIST = $(man1_MANS) $(man5_MANS)
+-- 
+1.7.4
+
diff --git a/lrzip-0.600-Install-un-packing-symlinks.patch b/lrzip-0.600-Install-un-packing-symlinks.patch
new file mode 100644
index 0000000..b553fc3
--- /dev/null
+++ b/lrzip-0.600-Install-un-packing-symlinks.patch
@@ -0,0 +1,24 @@
+From 7b397929059ba1eb9f70b50e60a1d9efb63e12c6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 23 Mar 2011 17:25:11 +0100
+Subject: [PATCH] Install  un-packing symlinks
+
+---
+ Makefile.am |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 71e88a5..0e52758 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -73,3 +73,7 @@ EXTRA_DIST = \
+ 		autogen.sh \
+ 		INSTALL \
+ 		$(dist_doc_DATA)
++
++install-exec-hook:
++	$(LN_S) lrzip $(DESTDIR)$(bindir)/lrunzip
++	$(LN_S) lrztar $(DESTDIR)$(bindir)/lrzuntar
+-- 
+1.7.4
+
diff --git a/lrzip.spec b/lrzip.spec
index dc3a907..5a9300f 100644
--- a/lrzip.spec
+++ b/lrzip.spec
@@ -1,5 +1,5 @@
 Name:           lrzip
-Version:        0.571
+Version:        0.600
 Release:        1%{?dist}
 Summary:        Compression program optimized for large files
 
@@ -7,11 +7,17 @@ Group:          Applications/File
 License:        GPLv2+
 URL:            http://ck.kolivas.org/apps/%{name}/
 Source0:        http://ck.kolivas.org/apps/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         lrzip-0.600-Generate-manual-from-POD.patch
+Patch1:         lrzip-0.600-Install-un-packing-symlinks.patch
 
 BuildRequires:  bzip2-devel lzo-devel zlib-devel
 %ifarch x86
 BuildRequires:  nasm
 %endif
+# Because of lrzip-0.600-Generate-manual-from-POD.patch and
+# lrzip-0.600-Install-un-packing-symlinks.patch:
+BuildRequires:  autoconf automake perl
+
 
 %description
 Long Range ZIP or Lzma RZIP
@@ -25,10 +31,20 @@ than bzip2). Decompression is always much faster than bzip2.
 
 %prep
 %setup -q
+%patch0 -p1 -b .pod2man
+%patch1 -p1 -b .symlinks
+autoreconf
+
+for F in lzma/history.txt; do
+    iconv -f ISO-8859-1 -t UTF-8 < "$F" > "${F}.utf8"
+    touch -r "$F" "${F}.utf8"
+    mv "${F}.utf8" "$F"
+done
 
 
+%global docdir %{_datadir}/doc/%{name}-%{version}
 %build
-%configure
+%configure --docdir='%{docdir}'
 make %{?_smp_mflags}
 
 
@@ -38,15 +54,23 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS ChangeLog COPYING
-%doc README README-NOT-BACKWARD-COMPATIBLE TODO WHATS-NEW
-%doc doc/*
+#%%doc AUTHORS BUGS ChangeLog COPYING
+#%%doc README README-NOT-BACKWARD-COMPATIBLE TODO WHATS-NEW
+#%%doc doc/*
+%{docdir}
 %{_bindir}/*
 %{_mandir}/man1/*.1.gz
 %{_mandir}/man5/*.5.gz
 
 
 %changelog
+* Wed Mar 23 2011 Petr Pisar <ppisar at redhat.com> - 0.600-1
+- 0.600 bump
+- Archives generated by this version are not backward compatible
+- Fix manual pages generation
+- Fix symlinks installation
+- Recode non-UTF-8 documentation
+
 * Tue Mar 08 2011 Petr Pisar <ppisar at redhat.com> - 0.571-1
 - 0.571 bump
 
diff --git a/sources b/sources
index 8db55c6..a9598a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10011d3eaf7ecb4506953c53dae6d0d7  lrzip-0.571.tar.bz2
+1521542abf1bc8a67a4383ec269e8c22  lrzip-0.600.tar.bz2
