Accepting request 252325 from zypp:Head
Softwarestack update OBS-URL: https://build.opensuse.org/request/show/252325 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=326
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
a50df63504
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:334a81569381cb06190f26afaf597de90fd43276d2d01c3e401efc0360161127
|
||||
size 4605605
|
||||
3
libzypp-14.29.4.tar.bz2
Normal file
3
libzypp-14.29.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d4067e74aa3ec29e6cd98803b43e91a957c8e2d28176fc646ce2bfab751056d6
|
||||
size 4994179
|
||||
@ -1,6 +1,62 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 25 17:59:06 CEST 2014 - ma@suse.de
|
||||
|
||||
- Trigger appdata plugin when system repos have changed (bnc#866257)
|
||||
- Protect against race when destructing globals
|
||||
- BuildRequire libsolv-tools as libsolv-devel no longer does
|
||||
- version 14.29.4 (29)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 25 01:15:42 CEST 2014 - ma@suse.de
|
||||
|
||||
- Update zypp-po.tar.bz2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 23 17:07:45 CEST 2014 - ma@suse.de
|
||||
|
||||
- Fix computation of userinstalled items (bnc#897404)
|
||||
- version 14.29.3 (29)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 23 10:55:08 CEST 2014 - ma@suse.de
|
||||
|
||||
- Adapt to API changes in rpm.4.12
|
||||
- SLE-12 (suse_version 1315) uses it's own translations set
|
||||
(bnc#897176)
|
||||
- version 14.29.2 (29)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 21 01:13:25 CEST 2014 - ma@suse.de
|
||||
|
||||
- Update zypp-po.tar.bz2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 18 15:47:50 CEST 2014 - ma@suse.de
|
||||
|
||||
- Update sle-zypp-po.tar.bz2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 18 15:47:34 CEST 2014 - ma@suse.de
|
||||
|
||||
- Update zypp-po.tar.bz2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 18 15:46:11 CEST 2014 - ma@suse.de
|
||||
|
||||
- Update zypp-po.tar.bz2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 17 13:18:23 CEST 2014 - ma@suse.de
|
||||
|
||||
- adjust BuildRequires
|
||||
- version 14.29.1 (29)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 16 10:45:39 CEST 2014 - ma@suse.de
|
||||
|
||||
- DiskUsageCounter: Set growonly on detetcted snapshotting btrfs
|
||||
partitions (bnc#896176)
|
||||
- DiskUsageCounter: Allow MountPoint to store fstype
|
||||
- DiskUsageCounter: Support setting 'growonly' partition hint
|
||||
(bnc#896176)
|
||||
- version 14.29.0 (29)
|
||||
|
||||
18
libzypp.spec
18
libzypp.spec
@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Summary: Package, Patch, Pattern, and Product Management
|
||||
License: GPL-2.0+
|
||||
Group: System/Packages
|
||||
Version: 14.29.0
|
||||
Version: 14.29.4
|
||||
Release: 0
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: %{name}-rpmlintrc
|
||||
@ -32,6 +32,7 @@ Obsoletes: yast2-packagemanager
|
||||
|
||||
# Features we provide (update doc/autoinclude/FeatureTest.doc):
|
||||
Provides: libzypp(plugin) = 0
|
||||
Provides: libzypp(plugin:appdata) = 0
|
||||
Provides: libzypp(plugin:commit) = 1
|
||||
Provides: libzypp(plugin:services) = 0
|
||||
Provides: libzypp(plugin:system) = 0
|
||||
@ -75,6 +76,7 @@ BuildRequires: pkg-config
|
||||
|
||||
BuildRequires: libsolv-devel >= 0.6.5
|
||||
%if 0%{?suse_version} >= 1100
|
||||
BuildRequires: libsolv-tools
|
||||
%requires_eq libsolv-tools
|
||||
%else
|
||||
Requires: libsolv-tools
|
||||
@ -209,13 +211,20 @@ export CFLAGS="$RPM_OPT_FLAGS"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS"
|
||||
unset TRANSLATION_SET
|
||||
unset EXTRA_CMAKE_OPTIONS
|
||||
# SLE11-* might want its own translation set:
|
||||
%if 0%{?suse_version} == 1110
|
||||
# Same codebase, but SLES may use it's own translation set.
|
||||
# suse_version
|
||||
# 1110 SLES11
|
||||
# 1315 SLES12
|
||||
%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
|
||||
if [ -f ../po/sle-zypp-po.tar.bz ]; then
|
||||
export TRANSLATION_SET=sle-zypp
|
||||
export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
|
||||
fi
|
||||
%endif
|
||||
# No libproxy on SLE11
|
||||
%if 0%{?suse_version} == 1110
|
||||
export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
|
||||
%endif
|
||||
|
||||
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||
-DDOC_INSTALL_DIR=%{_docdir} \
|
||||
-DLIB=%{_lib} \
|
||||
@ -252,6 +261,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/vendors.d
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/multiversion.d
|
||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp
|
||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins
|
||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/appdata
|
||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/commit
|
||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/services
|
||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/system
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user