diff --git a/bzip2.spec b/bzip2.spec index 759c078..7b238f2 100644 --- a/bzip2.spec +++ b/bzip2.spec @@ -1,15 +1,15 @@ %define libname libbzip2 Name: bzip2 -Version: 1.0.6 -Release: 3mamba +Version: 1.0.8 +Release: 1mamba Summary: Extremely powerful file compression utility Group: Applications/Archiving Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://www.bzip.org/ -Source: http://www.bzip.org/%{version}/bzip2-%{version}.tar.gz +Source: git://sourceware.org/git/bzip2.git/bzip2-%{version}/bzip2-%{version}.tar.bz2 Patch0: %{name}-1.0.6-cflags.patch Patch1: %{name}-1.0.6-makefiles.patch Patch4: %{name}-1.0.3-cross_compiling.patch @@ -64,18 +64,18 @@ Header files and static library of bzip2 functions, for developing apps which wi %prep %setup -q -%patch0 -p1 -b .cflags -%patch1 -p1 -b .makefiles +#% patch0 -p1 -b .cflags +#% patch1 -p1 -b .makefiles %if "%{_target_platform}" != "%{_build}" %patch4 -p1 -b .cross_compiling %endif -%patch5 -p1 -b bzip2recover_strncpy +#% patch5 -p1 -b bzip2recover_strncpy # x86_64 lib64 support sed -i "s@/lib\(/\| \|$\)@/%{_lib}\1@g" Makefile Makefile-libbz2_so %build -%make -f Makefile-libbz2_so \ +%make all -f Makefile-libbz2_so \ CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -fpic -fPIC" \ CC=%{_target_platform}-gcc \ AR=%{_target_platform}-ar \ @@ -94,13 +94,7 @@ sed -i "s@/lib\(/\| \|$\)@/%{_lib}\1@g" Makefile Makefile-libbz2_so make install PREFIX=%{buildroot}%{_prefix} -make install -f Makefile-libbz2_so \ - CC=%{_target_platform}-gcc \ - AR=%{_target_platform}-ar \ - RANLIB=%{_target_platform}-ranlib \ - PREFIX=%{buildroot}%{_prefix} - -mv %{buildroot}%{_bindir}/bzip2-shared %{buildroot}%{_bindir}/bzip2 +install -m0755 bzip2-shared %{buildroot}%{_bindir}/bzip2 rm -f %{buildroot}%{_bindir}/{bunzip2,bzcat} ln -s bzip2 %{buildroot}%{_bindir}/bunzip2 @@ -112,11 +106,13 @@ ln -s bzdiff %{buildroot}%{_bindir}/bzcmp rm -f %{buildroot}%{_bindir}/bzless ln -s bzmore %{buildroot}%{_bindir}/bzless +install -d -m0755 %{buildroot}%{_datadir} +mv %{buildroot}%{_prefix}/man %{buildroot}%{_datadir}/ ln -s bzip2.1 %{buildroot}%{_mandir}/man1/bzip2recover.1 ln -s bzip2.1 %{buildroot}%{_mandir}/man1/bunzip2.1 ln -s bzip2.1 %{buildroot}%{_mandir}/man1/bzcat.1 -rm -f %{buildroot}%{_mandir}/man1/bzless.1 -ln -s bzmore.1 %{buildroot}%{_mandir}/man1/bzless.1 +#rm -f %{buildroot}%{_mandir}/man1/bzless.1 +#ln -s bzmore.1 %{buildroot}%{_mandir}/man1/bzless.1 # fix broken symlinks ln -sf bzgrep %{buildroot}%{_bindir}/bzegrep @@ -128,6 +124,7 @@ ln -s %{_bindir}/bzip2 %{buildroot}/bin/bzip2 ln -s %{_bindir}/bzip2 %{buildroot}/bin/bunzip2 ln -s %{_bindir}/bzip2 %{buildroot}/bin/bzcat +install -D -m0755 libbz2.so.%{version} %{buildroot}%{_libdir}/libbz2.so.%{version} ln -s libbz2.so.1.0 %{buildroot}%{_libdir}/libbz2.so ln -s libbz2.so.%{version} %{buildroot}%{_libdir}/libbz2.so.1.0 @@ -203,6 +200,9 @@ ln -s libbz2.so.%{version} %{buildroot}%{_prefix}/lib/libbz2.so.1.0 %endif %changelog +* Fri Aug 02 2019 Silvan Calarco 1.0.8-1mamba +- update to 1.0.8 + * Sun Aug 19 2012 Silvan Calarco 1.0.6-3mamba - fix requirements of subpackages to match exact version and release - added build requirements