From 1b8415e675b924eca67f502938665d31598e8c8af1b78a9b5873caa277143c31 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Mon, 1 Aug 2011 16:20:37 +0000 Subject: [PATCH] Update to last sucessful build abe7cef503ce353b6b0716b71874a02bdb23af33 Use fedora specfile also on rel/centos-6 OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=806 --- libzypp-9.9.2.tar.bz2 | 4 ++-- libzypp.spec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libzypp-9.9.2.tar.bz2 b/libzypp-9.9.2.tar.bz2 index e27ce2e..a93c654 100644 --- a/libzypp-9.9.2.tar.bz2 +++ b/libzypp-9.9.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd8969db8f098f45cc403fef24bf03af9ce724ae830a3f2982ddb679f99e03d7 -size 4697232 +oid sha256:ff10ae2c397da22ab01fa166448cde2c36da83f1556adbc6ad73c803fa775ffe +size 4696460 diff --git a/libzypp.spec b/libzypp.spec index 4be1e24..5cd541f 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -74,7 +74,7 @@ BuildRequires: hicolor-icon-theme %endif %endif -%if 0%{?fedora_version} +%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600 BuildRequires: glib2-devel BuildRequires: popt-devel BuildRequires: rpm-devel @@ -230,7 +230,7 @@ rm -rf "$RPM_BUILD_ROOT" cd build make install DESTDIR=$RPM_BUILD_ROOT make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT -%if 0%{?fedora_version} +%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600 ln -s %{_sysconfdir}/yum.repos.d $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d %else mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d @@ -325,7 +325,7 @@ rm -rf "$RPM_BUILD_ROOT" %files -f zypp.lang %defattr(-,root,root) %dir %{_sysconfdir}/zypp -%if 0%{?fedora_version} +%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600 %{_sysconfdir}/zypp/repos.d %else %dir %{_sysconfdir}/zypp/repos.d