Compare commits

..

No commits in common. "c8s" and "c9-beta" have entirely different histories.
c8s ... c9-beta

7 changed files with 51 additions and 41 deletions

3
.gitignore vendored
View File

@ -1,2 +1 @@
SOURCES/lzo-2.08.tar.gz SOURCES/lzo-2.10.tar.gz
/lzo-2.08.tar.gz

1
.lzo.metadata Normal file
View File

@ -0,0 +1 @@
4924676a9bae5db58ef129dc1cebce3baa3c4b5d SOURCES/lzo-2.10.tar.gz

View File

@ -1,14 +1,16 @@
Name: lzo Name: lzo
Version: 2.08 Version: 2.10
Release: 14%{?dist} Release: 7%{?dist}
Summary: Data compression library with very fast (de)compression Summary: Data compression library with very fast (de)compression
Group: System Environment/Libraries
License: GPLv2+ License: GPLv2+
URL: http://www.oberhumer.com/opensource/lzo/ URL: http://www.oberhumer.com/opensource/lzo/
Source0: http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz Source0: http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz
Patch0: lzo-2.08-configure.patch Patch0: lzo-2.08-configure.patch
Patch1: lzo-2.08-rhbz1309225.patch Patch1: lzo-2.08-rhbz1309225.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: make
BuildRequires: gcc
BuildRequires: zlib-devel BuildRequires: zlib-devel
%description %description
@ -21,7 +23,6 @@ while still decompressing at this very high speed.
%package minilzo %package minilzo
Summary: Mini version of lzo for apps which don't need the full version Summary: Mini version of lzo for apps which don't need the full version
Group: System Environment/Libraries
%description minilzo %description minilzo
A small (mini) version of lzo for embedding into applications which don't need A small (mini) version of lzo for embedding into applications which don't need
@ -30,7 +31,6 @@ full blown lzo compression support.
%package devel %package devel
Summary: Development files for the lzo library Summary: Development files for the lzo library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name}-minilzo = %{version}-%{release} Requires: %{name}-minilzo = %{version}-%{release}
Requires: zlib-devel Requires: zlib-devel
@ -42,32 +42,26 @@ This package contains development files needed for lzo.
%prep %prep
%setup -q %autosetup -p1
%patch0 -p1 -z .configure
%patch1 -p1 -z .rhbz1309225
# mark asm files as NOT needing execstack # mark asm files as NOT needing execstack
for i in asm/i386/src_gas/*.S; do for i in asm/i386/src_gas/*.S; do
echo '.section .note.GNU-stack,"",@progbits' >> $i echo '.section .note.GNU-stack,"",@progbits' >> $i
done done
# remove objects
rm -rf asm/i386/obj
%build %build
# workaround for annocheck
export CCASFLAGS="--generate-missing-build-notes=yes"
%configure --disable-dependency-tracking --disable-static --enable-shared %configure --disable-dependency-tracking --disable-static --enable-shared
make %{?_smp_mflags} %{make_build} CFLAGS+=-fno-strict-aliasing
# build minilzo too (bz 439979) # build minilzo too (bz 439979)
gcc %{optflags} -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c gcc %{optflags} -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c
gcc -g -shared -Wl,-z,now -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o gcc -g -shared -Wl,-z,now -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o
%install %install
rm -rf $RPM_BUILD_ROOT %{make_install}
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" find $RPM_BUILD_ROOT -name '*.la' -delete
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
install -m 755 libminilzo.so.0 $RPM_BUILD_ROOT%{_libdir} install -m 755 libminilzo.so.0 $RPM_BUILD_ROOT%{_libdir}
ln -s libminilzo.so.0 $RPM_BUILD_ROOT%{_libdir}/libminilzo.so ln -s libminilzo.so.0 $RPM_BUILD_ROOT%{_libdir}/libminilzo.so
install -p -m 644 minilzo/minilzo.h $RPM_BUILD_ROOT%{_includedir}/lzo install -p -m 644 minilzo/minilzo.h $RPM_BUILD_ROOT%{_includedir}/lzo
@ -79,42 +73,65 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/lzo
make check test make check test
%clean
rm -rf $RPM_BUILD_ROOT
%ldconfig_scriptlets %ldconfig_scriptlets
%ldconfig_scriptlets minilzo %ldconfig_scriptlets minilzo
%files %files
%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%doc AUTHORS THANKS NEWS %doc AUTHORS THANKS NEWS
%{_libdir}/liblzo2.so.* %{_libdir}/liblzo2.so.*
%files minilzo %files minilzo
%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%doc minilzo/README.LZO %doc minilzo/README.LZO
%{_libdir}/libminilzo.so.0 %{_libdir}/libminilzo.so.0
%files devel %files devel
%defattr(-,root,root,-)
%doc doc/LZOAPI.TXT doc/LZO.FAQ doc/LZO.TXT %doc doc/LZOAPI.TXT doc/LZO.FAQ doc/LZO.TXT
%{_includedir}/lzo %{_includedir}/lzo
%{_libdir}/lib*lzo*.so %{_libdir}/lib*lzo*.so
%{_libdir}/pkgconfig/lzo2.pc
%changelog %changelog
* Tue Oct 9 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.08-14 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.10-7
- Added build notes to AS generated objects - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Resolves: rhbz#1630594 Related: rhbz#1991688
* Fri Jul 27 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.08-13 * Wed May 26 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.10-6
- Dropped unused patches - Release bump to drop unused patches from the dist-git
Resolves: rhbz#1956457
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.10-5
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Mar 02 2020 Michael Cronenworth <mike@cchtml.com> - 2.10-2
- Disable -fno-strict-aliasing (RHBZ#1807737)
* Sun Feb 9 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2.10-1
- Update to 2.10
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.08-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.08-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.08-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.08-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.08-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.08-12 * Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.08-12
- Switch to %%ldconfig_scriptlets - Switch to %%ldconfig_scriptlets

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

View File

@ -1 +0,0 @@
SHA512 (lzo-2.08.tar.gz) = d03ae521000d69dd1fc92112a7b6e642c388b2898d7fb6ac4168e947a895e8d5e77199f78f05e036cefe02f346ea242bca694522f3c7959ab6ca19de956162dd