rpms/lzo/devel lzo-2.02-configure.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 lzo.spec, 1.11, 1.12 sources, 1.2, 1.3 lzo-1.08-asm.patch, 1.1, NONE lzo-1.08-noexecstack.patch, 1.1, NONE

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Wed Jul 26 10:58:36 UTC 2006


Author: jwrdegoede

Update of /cvs/extras/rpms/lzo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5254

Modified Files:
	.cvsignore lzo.spec sources 
Added Files:
	lzo-2.02-configure.patch 
Removed Files:
	lzo-1.08-asm.patch lzo-1.08-noexecstack.patch 
Log Message:
* Wed Jul 26 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.02-1
- New upstream release 2.02, soname change!


lzo-2.02-configure.patch:

--- NEW FILE lzo-2.02-configure.patch ---
--- lzo-2.02/configure.configure	2005-10-17 18:10:50.000000000 +0200
+++ lzo-2.02/configure	2006-07-26 12:51:27.000000000 +0200
@@ -19994,7 +19994,7 @@
 asm_msg_amd64=no
 asm_msg_i386=no
 
-case $host_cpu in
+case $target_cpu in
     amd64 | x86_64) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64" ;;
     i?86) asm_arch="i386"; asm_dir="asm/i386/src_gas" ;;
     *) enable_asm=no ;;
--- lzo-2.02/configure.ac.configure	2006-07-26 12:54:58.000000000 +0200
+++ lzo-2.02/configure.ac	2006-07-26 12:55:17.000000000 +0200
@@ -79,7 +79,7 @@
 asm_msg_amd64=no
 asm_msg_i386=no
 
-case $host_cpu in
+case $target_cpu in
     amd64 | x86_64) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64" ;;
     i?86) asm_arch="i386"; asm_dir="asm/i386/src_gas" ;;
     *) enable_asm=no ;;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lzo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:51:28 -0000	1.2
+++ .cvsignore	26 Jul 2006 10:58:35 -0000	1.3
@@ -1 +1 @@
-lzo-1.08.tar.gz
+lzo-2.02.tar.gz


Index: lzo.spec
===================================================================
RCS file: /cvs/extras/rpms/lzo/devel/lzo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lzo.spec	25 Jul 2006 20:02:26 -0000	1.11
+++ lzo.spec	26 Jul 2006 10:58:35 -0000	1.12
@@ -1,14 +1,13 @@
-Summary:        Data compression library with very fast (de)compression
 Name:           lzo
-Version:        1.08
-Release:        7%{?dist}
-License:        GPL
+Version:        2.02
+Release:        1%{?dist}
+Summary:        Data compression library with very fast (de)compression
 Group:          System Environment/Libraries
+License:        GPL
 URL:            http://www.oberhumer.com/opensource/lzo/
 Source0:        http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz
-Patch0:         lzo-1.08-asm.patch
-Patch1:         lzo-1.08-noexecstack.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Patch0:         lzo-2.02-configure.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel
 
 %description
@@ -33,8 +32,11 @@
 
 %prep
 %setup -q
-%patch0 -p1 -z .asm
-%patch1 -p1 -z .execstack
+%patch0 -p1 -z .configure
+# mark asm files as NOT needing execstack
+for i in asm/i386/src_gas/*.S; do
+  echo '.section .note.GNU-stack,"", at progbits' >> $i
+done
 
 
 %build
@@ -42,14 +44,14 @@
 make %{?_smp_mflags}
 
 
-%check || :
-make check test
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/liblzo.la
+rm $RPM_BUILD_ROOT%{_libdir}/liblzo2.la
+
+
+%check
+make check test
 
 
 %clean
@@ -57,22 +59,26 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING THANKS NEWS
-%{_libdir}/liblzo.so.*
+%{_libdir}/liblzo2.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/LZOAPI.TXT doc/LZO.FAQ doc/LZO.TXT
-%{_includedir}/lzo*.h
-%{_libdir}/liblzo.so
+%{_includedir}/lzo
+%{_libdir}/liblzo2.so
 
 
 %changelog
+* Wed Jul 26 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.02-1
+- New upstream release 2.02, soname change!
+
 * Mon Jul 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.08-7
 - Taking over as maintainer since Anvil has other priorities
 - Add a patch to fix asm detection on i386 (bug 145882, 145893). Thanks to


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lzo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:51:28 -0000	1.2
+++ sources	26 Jul 2006 10:58:35 -0000	1.3
@@ -1 +1 @@
-ab94d3da364c7cbd5b78d76f1875b0f6  lzo-1.08.tar.gz
+6760e5819f4238328709bf93bf10071c  lzo-2.02.tar.gz


--- lzo-1.08-asm.patch DELETED ---


--- lzo-1.08-noexecstack.patch DELETED ---




More information about the fedora-extras-commits mailing list