Update to last successful build

b378757e7fc58e2a365d7b5c61b44447dd76b3f1 spec: make use of %make_install

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2050
This commit is contained in:
ZYpp Developers 2018-11-20 11:41:59 +00:00 committed by Git OBS Bridge
parent 0e090d5d14
commit 17a41847ea
2 changed files with 48 additions and 37 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:81d9ceafacabaa24b484cb40abe0ae4a94e6cdad9bf5ca0507cf92dbc0b9f058 oid sha256:37f5731cc51d9e6cee55733b258c947235ef6dc507367d9e77595ce850f79f4d
size 4713764 size 4714432

View File

@ -20,7 +20,7 @@ Name: libzypp
Version: 17.9.0 Version: 17.9.0
Release: 0 Release: 0
Url: https://github.com/openSUSE/libzypp Url: https://github.com/openSUSE/libzypp
Summary: Package, Patch, Pattern, and Product Management Summary: Library for package, patch, pattern and product management
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Packages Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -134,10 +134,24 @@ BuildRequires: libxslt-tools
%endif %endif
%description %description
Package, Patch, Pattern, and Product Management libzypp is the package management library that powers applications
like YaST, zypper and the openSUSE/SLE implementation of PackageKit.
libzypp provides functionality for a package manager:
* An API for package repository management, supporting most common
repository metadata formats and signed repositories.
* An API for solving packages, products, patterns and patches
(installation, removal, update and distribution upgrade
operations) dependencies, with additional features like locking.
* An API for commiting the transaction to the system over a rpm
target. Supporting deltarpm calculation, media changing and
installation order calculation.
* An API for browsing available and installed software, with some
facilities for programs with an user interface.
%package devel %package devel
Summary: Package, Patch, Pattern, and Product Management - developers files Summary: Header files for libzypp, a library for package management
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: yast2-packagemanager-devel Provides: yast2-packagemanager-devel
Obsoletes: yast2-packagemanager-devel Obsoletes: yast2-packagemanager-devel
@ -182,14 +196,15 @@ Requires: libsolv-devel
%endif %endif
%description devel %description devel
Package, Patch, Pattern, and Product Management - developers files Development files for libzypp, a library for package, patch, pattern
and product management.
%package devel-doc %package devel-doc
Summary: Package, Patch, Pattern, and Product Management - developers files Summary: Developer documentation for libzypp
Group: Documentation/HTML Group: Documentation/HTML
%description devel-doc %description devel-doc
Package, Patch, Pattern, and Product Management - developers files Developer documentation for libzypp.
%prep %prep
%setup -q %setup -q
@ -197,8 +212,8 @@ Package, Patch, Pattern, and Product Management - developers files
%build %build
mkdir build mkdir build
cd build cd build
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="%{optflags}"
export CXXFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="%{optflags}"
unset EXTRA_CMAKE_OPTIONS unset EXTRA_CMAKE_OPTIONS
# No libproxy on SLE11 # No libproxy on SLE11
%if 0%{?suse_version} == 1110 %if 0%{?suse_version} == 1110
@ -218,46 +233,45 @@ make -C po %{?_smp_mflags} translations
make -C tests %{?_smp_mflags} make -C tests %{?_smp_mflags}
%install %install
rm -rf "$RPM_BUILD_ROOT"
cd build cd build
make install DESTDIR=$RPM_BUILD_ROOT %make_install
make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT %make_install -C doc/autodoc
%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600 %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 ln -s %{_sysconfdir}/yum.repos.d %{buildroot}/%{_sysconfdir}/zypp/repos.d
%else %else
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d mkdir -p %{buildroot}/%{_sysconfdir}/zypp/repos.d
%endif %endif
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/services.d mkdir -p %{buildroot}/%{_sysconfdir}/zypp/services.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/systemCheck.d mkdir -p %{buildroot}/%{_sysconfdir}/zypp/systemCheck.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/vars.d mkdir -p %{buildroot}/%{_sysconfdir}/zypp/vars.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/vendors.d mkdir -p %{buildroot}/%{_sysconfdir}/zypp/vendors.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/multiversion.d mkdir -p %{buildroot}/%{_sysconfdir}/zypp/multiversion.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/needreboot.d mkdir -p %{buildroot}/%{_sysconfdir}/zypp/needreboot.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/credentials.d mkdir -p %{buildroot}/%{_sysconfdir}/zypp/credentials.d
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp mkdir -p %{buildroot}/%{_prefix}/lib/zypp
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins mkdir -p %{buildroot}/%{_prefix}/lib/zypp/plugins
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/appdata mkdir -p %{buildroot}/%{_prefix}/lib/zypp/plugins/appdata
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/commit mkdir -p %{buildroot}/%{_prefix}/lib/zypp/plugins/commit
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/services mkdir -p %{buildroot}/%{_prefix}/lib/zypp/plugins/services
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/system mkdir -p %{buildroot}/%{_prefix}/lib/zypp/plugins/system
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/urlresolver mkdir -p %{buildroot}/%{_prefix}/lib/zypp/plugins/urlresolver
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/zypp mkdir -p %{buildroot}/%{_var}/lib/zypp
mkdir -p $RPM_BUILD_ROOT%{_var}/log/zypp mkdir -p %{buildroot}/%{_var}/log/zypp
mkdir -p $RPM_BUILD_ROOT%{_var}/cache/zypp mkdir -p %{buildroot}/%{_var}/cache/zypp
# Default to 'solver.dupAllowVendorChange = false' on TW and post SLE12 # Default to 'solver.dupAllowVendorChange = false' on TW and post SLE12
%if 0%{?suse_version} >= 1330 || "%{distribution}" == "openSUSE Tumbleweed" %if 0%{?suse_version} >= 1330 || "%{distribution}" == "openSUSE Tumbleweed"
sed -i "s|# solver.dupAllowVendorChange = true|solver.dupAllowVendorChange = false|g" %{buildroot}%{_sysconfdir}/zypp/zypp.conf sed -i "s|# solver.dupAllowVendorChange = true|solver.dupAllowVendorChange = false|g" %{buildroot}%{_sysconfdir}/zypp/zypp.conf
%endif %endif
make -C po install DESTDIR=$RPM_BUILD_ROOT %make_install -C po
# Create filelist with translations # Create filelist with translations
cd .. cd ..
%{find_lang} zypp %{find_lang} zypp
%check %check
pushd build/tests pushd build/tests
LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:${LD_LIBRARY_PATH} ctest . LD_LIBRARY_PATH="%{buildroot}/%{_libdir}:$LD_LIBRARY_PATH" ctest .
popd popd
%post %post
@ -326,9 +340,6 @@ fi
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%clean
rm -rf "$RPM_BUILD_ROOT"
%files -f zypp.lang %files -f zypp.lang
%defattr(-,root,root) %defattr(-,root,root)
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500