[lrzip] Bump 0.46

Mon Aug 9 08:46:34 UTC 2010

commit 4cdb9798d407e77e92ad6798b977ddbeb456fe6a
Author: Petr Písař <ppisar at redhat.com>
Date:   Mon Aug 9 10:45:42 2010 +0200

    Bump 0.46
    
    This upgrade breaks lrzip archive format (since version 0.40).

 .gitignore                                         |    1 +
 ...6-do_not_embed_DESTDIR_into_symlink_value.patch |   27 ++++++++++++++
 lrzip-0.46-install_relative_symlinks.patch         |   27 ++++++++++++++
 lrzip.spec                                         |   39 ++++++++++++++------
 sources                                            |    2 +-
 5 files changed, 83 insertions(+), 13 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 6ddcfaa..af7702a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 lrzip-0.23.tar.bz2
+lrzip-0.46.tar.bz2
diff --git a/lrzip-0.46-do_not_embed_DESTDIR_into_symlink_value.patch b/lrzip-0.46-do_not_embed_DESTDIR_into_symlink_value.patch
new file mode 100644
index 0000000..da9a2d2
--- /dev/null
+++ b/lrzip-0.46-do_not_embed_DESTDIR_into_symlink_value.patch
@@ -0,0 +1,27 @@
+From ac2ef13202d8031ad068c582668382e1ea215dd1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Fri, 6 Aug 2010 15:32:09 +0200
+Subject: [PATCH] Do not embed DESTDIR into symlink value
+
+---
+ Makefile.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index c92dc0b..c180336 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -102,8 +102,8 @@ install: all
+ 	mkdir -p $(DESTDIR)${INSTALL_BIN}
+ 	${INSTALLCMD} -m 755 lrzip $(DESTDIR)${INSTALL_BIN}
+ 	${INSTALLCMD} -m 755 lrztar $(DESTDIR)${INSTALL_BIN}
+-	${LN_S} -f $(DESTDIR)${INSTALL_BIN}/lrzip $(DESTDIR)${INSTALL_BIN}/lrunzip
+-	${LN_S} -f $(DESTDIR)${INSTALL_BIN}/lrztar $(DESTDIR)${INSTALL_BIN}/lrzuntar
++	${LN_S} -f ${INSTALL_BIN}/lrzip $(DESTDIR)${INSTALL_BIN}/lrunzip
++	${LN_S} -f ${INSTALL_BIN}/lrztar $(DESTDIR)${INSTALL_BIN}/lrzuntar
+ 	chmod 755 $(DESTDIR)${INSTALL_BIN}/lrzuntar
+ 	mkdir -p $(DESTDIR)${INSTALL_MAN1}
+ 	${INSTALLCMD} -m 644 $(MAN1FILES) $(DESTDIR)${INSTALL_MAN1}
+-- 
+1.7.2.1
+
diff --git a/lrzip-0.46-install_relative_symlinks.patch b/lrzip-0.46-install_relative_symlinks.patch
new file mode 100644
index 0000000..a417714
--- /dev/null
+++ b/lrzip-0.46-install_relative_symlinks.patch
@@ -0,0 +1,27 @@
+From b5b16a9fe28715787c7e159c828c07c46c4a3952 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Mon, 9 Aug 2010 10:21:01 +0200
+Subject: [PATCH] Install relative symlinks
+
+---
+ Makefile.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index c180336..e23d32a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -102,8 +102,8 @@ install: all
+ 	mkdir -p $(DESTDIR)${INSTALL_BIN}
+ 	${INSTALLCMD} -m 755 lrzip $(DESTDIR)${INSTALL_BIN}
+ 	${INSTALLCMD} -m 755 lrztar $(DESTDIR)${INSTALL_BIN}
+-	${LN_S} -f ${INSTALL_BIN}/lrzip $(DESTDIR)${INSTALL_BIN}/lrunzip
+-	${LN_S} -f ${INSTALL_BIN}/lrztar $(DESTDIR)${INSTALL_BIN}/lrzuntar
++	${LN_S} -f lrzip $(DESTDIR)${INSTALL_BIN}/lrunzip
++	${LN_S} -f lrztar $(DESTDIR)${INSTALL_BIN}/lrzuntar
+ 	chmod 755 $(DESTDIR)${INSTALL_BIN}/lrzuntar
+ 	mkdir -p $(DESTDIR)${INSTALL_MAN1}
+ 	${INSTALLCMD} -m 644 $(MAN1FILES) $(DESTDIR)${INSTALL_MAN1}
+-- 
+1.7.2.1
+
diff --git a/lrzip.spec b/lrzip.spec
index 040506c..378b079 100644
--- a/lrzip.spec
+++ b/lrzip.spec
@@ -1,28 +1,35 @@
 Name:           lrzip
-Version:        0.23
-Release:        3%{?dist}
-Summary:        Compression program optimised for large files
+Version:        0.46
+Release:        1%{?dist}
+Summary:        Compression program optimized for large files
 
 Group:          Applications/File
 License:        GPLv2+
-URL:            http://ck.kolivas.org/apps/lrzip/
-Source0:        http://ck.kolivas.org/apps/lrzip/lrzip-%{version}.tar.bz2
+URL:            http://ck.kolivas.org/apps/%{name}/
+Source0:        http://ck.kolivas.org/apps/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-0.46-do_not_embed_DESTDIR_into_symlink_value.patch
+Patch1:         %{name}-0.46-install_relative_symlinks.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bzip2-devel lzo-devel nasm
+BuildRequires:  bzip2-devel lzo-devel zlib-devel
+%ifarch x86
+BuildRequires:  nasm
+%endif
 
 %description
 Long Range ZIP or Lzma RZIP
 
-This is a compression program optimised for large files. The larger the file
+This is a compression program optimized for large files. The larger the file
 and the more memory you have, the better the compression advantage this will
-provide, especially once the files are larger than 100MB. The advantage can
+provide, especially once the files are larger than 100 MB. The advantage can
 be chosen to be either size (much smaller than bzip2) or speed (much faster
 than bzip2). Decompression is always much faster than bzip2.
 
 
 %prep
 %setup -q
+%patch0 -p1 -b .do_not_embed_destdir
+%patch1 -p1 -b .install_relative_symlinks
 
 
 %build
@@ -41,12 +48,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README
-%{_bindir}/lrzip
-%{_bindir}/lrunzip
-%{_datadir}/man/man1/lrzip.1.gz
+%doc AUTHORS BUGS ChangeLog COPYING
+%doc README README-NOT-BACKWARD-COMPATIBLE TODO WHATS-NEW
+%doc doc/*
+%{_bindir}/*
+%{_mandir}/man1/*.1.gz
+%{_mandir}/man5/*.5.gz
+
 
 %changelog
+* Mon Aug  9 2010 Petr Pisar <ppisar at redhat.com> - 0.46-1
+- 0.46 bump (bug #606722)
+- Version 0.40 breaks backward compatibility (archive format)
+- Fix package description spelling
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index f1a98b4..e351690 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a15ca1768adb50c839baabc13b0fb60a  lrzip-0.23.tar.bz2
+a6729f71e3d6e02dd691805f30ed1fca  lrzip-0.46.tar.bz2
