Diff: xz.spec - xz.spec

	xz.spec	xz.spec
	%global compat_ver xz-4.999.9beta	%global compat_ver xz-4.999.9beta

	Summary: LZMA compression utilities	Summary: LZMA compression utilities
	Name: xz	Name: xz

	Version: 5.1.2	Version: 5.2.0
	Release: 15alpha%{?dist}	Release: 1%{?dist}
	License: LGPLv2+	License: LGPLv2+
	Group: Applications/File	Group: Applications/File
	# official upstream release	# official upstream release

	Source0: http://tukaani.org/%{name}/%{name}-%{version}alpha.tar.gz	Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz
	# source created as "make dist" in checked out GIT tree	# source created as "make dist" in checked out GIT tree
	Source1: %{compat_ver}.20100401git.tar.bz2	Source1: %{compat_ver}.20100401git.tar.bz2

	Source100: colorxzgrep.sh	Source100: colorxzgrep.sh
	Source101: colorxzgrep.csh	Source101: colorxzgrep.csh

	URL: http://tukaani.org/%{name}/	URL: http://tukaani.org/%{name}/

	BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} - n)
	Requires: %{name}-libs%{?_isa} = %{version}-%{release}	Requires: %{name}-libs%{?_isa} = %{version}-%{release}


	# partly upstream/partly not (yet?)
	# ~> proposal: http://www.mail-archive.com/xz-devel@tukaani.org/msg00153.ht
	ml
	# ~> #948533
	Patch0: xz-5.1.2alpha-man-page-day.patch

	# fix 'xzgrep -h' to behave as expected
	# ~> upstream (5019413a0)
	# ~> #850898
	Patch1: xz-5.1.2alpha-xzgrep-and-h-option.patch

	# fix less version checking
	# ~> upstream (db5c1817fa, 9e6dabcf22)
	# ~> #1015924
	Patch2: xz-5.1.2alpha-less-version-check.patch

	# xzgrep: return 0 when at least one file matches (+ test)
	# ~> upstream (ceca37901783)
	# ~> #1109122
	Patch3: xz-5.1.2alpha-xzgrep-exit.patch
	Patch4: xz-5.1.2alpha-xzgrep-exit-test.patch

	%description	%description
	XZ Utils are an attempt to make LZMA compression easy to use on free (as in	XZ Utils are an attempt to make LZMA compression easy to use on free (as in
	freedom) operating systems. This is achieved by providing tools and librari es	freedom) operating systems. This is achieved by providing tools and librari es
	which are similar to use than the equivalents of the most popular existing	which are similar to use than the equivalents of the most popular existing
	compression algorithms.	compression algorithms.

	LZMA is a general purpose compression algorithm designed by Igor Pavlov as	LZMA is a general purpose compression algorithm designed by Igor Pavlov as
	part of 7-Zip. It provides high compression ratio while keeping the	part of 7-Zip. It provides high compression ratio while keeping the
	decompression speed fast.	decompression speed fast.


	skipping to change at line 102	skipping to change at line 80
	License: GPLv2+ and LGPLv2+	License: GPLv2+ and LGPLv2+
	Requires: %{name} = %{version}-%{release}	Requires: %{name} = %{version}-%{release}
	Obsoletes: lzma < %{version}	Obsoletes: lzma < %{version}
	Provides: lzma = %{version}	Provides: lzma = %{version}

	%description lzma-compat	%description lzma-compat
	The lzma-compat package contains compatibility links for older	The lzma-compat package contains compatibility links for older
	commands that deal with the older LZMA format.	commands that deal with the older LZMA format.

	%prep	%prep

	%setup -q -a1 -n %{name}-%{version}alpha	%setup -q -a1
	%patch0 -p1 -b .man-page-day
	%patch1 -p1 -b .xzgrep-and-h-option
	%patch2 -p1 -b .less-version-check
	%patch3 -p1 -b .xzgrep-exit-status
	%patch4 -p1 -b .xzgrep-exit-status-test

	for i in `find . -name config.sub`; do	for i in `find . -name config.sub`; do
	perl -pi -e "s/ppc64-\/ppc64-\ \\| ppc64p7-\*/" $i	perl -pi -e "s/ppc64-\/ppc64-\ \\| ppc64p7-\*/" $i
	done	done

	%build	%build
	CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"	CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"
	%ifarch %{power64}	%ifarch %{power64}
	CFLAGS=`echo $CFLAGS \| xargs -n 1 \| sed 's\|^-O2$\|-O3\|g' \| xargs -n 100`	CFLAGS=`echo $CFLAGS \| xargs -n 1 \| sed 's\|^-O2$\|-O3\|g' \| xargs -n 100`
	%endif	%endif

	skipping to change at line 133	skipping to change at line 106
	make %{?_smp_mflags}	make %{?_smp_mflags}

	pushd %{compat_ver}	pushd %{compat_ver}
	%configure	%configure
	sed -i 's\|^hardcode_libdir_flag_spec=.*\|hardcode_libdir_flag_spec=""\|g' lib tool	sed -i 's\|^hardcode_libdir_flag_spec=.*\|hardcode_libdir_flag_spec=""\|g' lib tool
	sed -i 's\|^runpath_var=LD_RUN_PATH\|runpath_var=DIE_RPATH_DIE\|g' libtool	sed -i 's\|^runpath_var=LD_RUN_PATH\|runpath_var=DIE_RPATH_DIE\|g' libtool
	make %{?_smp_mflags}	make %{?_smp_mflags}
	popd	popd

	%install	%install

	rm -rf %{buildroot}	make install DESTDIR=%{buildroot}
	make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
	rm -f %{buildroot}%{_libdir}/*.la	rm -f %{buildroot}%{_libdir}/*.la

	rm -rf %{buildroot}%{_docdir}/%{name}
	rm -rf %{buildroot}%{_datadir}/locale
	cp -r %{compat_ver}/src/liblzma/.libs/liblzma.so.0* %{buildroot}%{_libdir}	cp -r %{compat_ver}/src/liblzma/.libs/liblzma.so.0* %{buildroot}%{_libdir}


		# xzgrep colorization
	%global profiledir %{_sysconfdir}/profile.d	%global profiledir %{_sysconfdir}/profile.d
	mkdir -p %{buildroot}%{profiledir}	mkdir -p %{buildroot}%{profiledir}
	install -p -m 644 %{SOURCE100} %{buildroot}%{profiledir}	install -p -m 644 %{SOURCE100} %{buildroot}%{profiledir}
	install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir}	install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir}


		%find_lang %name

	%check	%check
	LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check	LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check


	%clean
	rm -rf %{buildroot}

	%post libs -p /sbin/ldconfig	%post libs -p /sbin/ldconfig

	%postun libs -p /sbin/ldconfig	%postun libs -p /sbin/ldconfig

	%post compat-libs -p /sbin/ldconfig	%post compat-libs -p /sbin/ldconfig

	%postun compat-libs -p /sbin/ldconfig	%postun compat-libs -p /sbin/ldconfig


	%files	%files -f %{name}.lang
	%defattr(-,root,root,-)
	%{!?_licensedir:%global license %%doc}	%{!?_licensedir:%global license %%doc}
	%license COPYING*	%license COPYING*

	%doc AUTHORS NEWS README THANKS TODO	%doc %{_docdir}
	%{_bindir}/xz	%{_bindir}/xz
	%{_mandir}/man1/xz	%{_mandir}/man1/xz
	%{profiledir}/*	%{profiledir}/*

	%files libs	%files libs

	%defattr(-,root,root,-)
	%{!?_licensedir:%global license %%doc}	%{!?_licensedir:%global license %%doc}
	%license COPYING*	%license COPYING*
	%{_libdir}/lib.so.5	%{_libdir}/lib.so.5

	%files static	%files static

	%defattr(-,root,root,-)
	%{!?_licensedir:%global license %%doc}	%{!?_licensedir:%global license %%doc}
	%license COPYING*	%license COPYING*
	%{_libdir}/liblzma.a	%{_libdir}/liblzma.a

	%files compat-libs	%files compat-libs

	%defattr(-,root,root,-)
	%{!?_licensedir:%global license %%doc}	%{!?_licensedir:%global license %%doc}
	%license COPYING*	%license COPYING*
	%{_libdir}/lib.so.0	%{_libdir}/lib.so.0

	%files devel	%files devel

	%defattr(-,root,root,-)
	%dir %{_includedir}/lzma	%dir %{_includedir}/lzma
	%{_includedir}/lzma/*.h	%{_includedir}/lzma/*.h
	%{_includedir}/lzma.h	%{_includedir}/lzma.h
	%{_libdir}/*.so	%{_libdir}/*.so
	%{_libdir}/pkgconfig/liblzma.pc	%{_libdir}/pkgconfig/liblzma.pc

	%files lzma-compat	%files lzma-compat

	%defattr(-,root,root,-)
	%{_bindir}/lz	%{_bindir}/lz
	%{_mandir}/man1/lz	%{_mandir}/man1/lz

	%changelog	%changelog

		* Tue Dec 23 2014 Pavel Raiskup <praiskup@redhat.com> - 5.2.0-1
		- rebase per upstream release notes:
		http://www.mail-archive.com/xz-devel@tukaani.org/msg00216.html

	* Tue Aug 26 2014 Pavel Raiskup <praiskup@redhat.com> - 5.1.2-15alpha	* Tue Aug 26 2014 Pavel Raiskup <praiskup@redhat.com> - 5.1.2-15alpha
	- xz*grep's output is colored iff grep's is (#1034846)	- xz*grep's output is colored iff grep's is (#1034846)

	* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.o rg> - 5.1.2-14alpha	* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.o rg> - 5.1.2-14alpha
	- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild	- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

	* Wed Aug 6 2014 Tom Callaway <spot@fedoraproject.org> - 5.1.2-13alpha	* Wed Aug 6 2014 Tom Callaway <spot@fedoraproject.org> - 5.1.2-13alpha
	- fix license handling	- fix license handling

	* Fri Jun 13 2014 Pavel Raiskup <praiskup@redhat.com> - 5.1.2-12alpha	* Fri Jun 13 2014 Pavel Raiskup <praiskup@redhat.com> - 5.1.2-12alpha

End of changes. 18 change blocks.
	47 lines changed or deleted	15 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/