Update to last sucessful build
fe3365fd1ac60925bc1a003efc3e7697b0647c1d Use g++-4.6 OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=886
This commit is contained in:
parent
33e9112b2b
commit
860e7fd97b
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:21d952aa21e5450e16ac763c49d0dcb6990853eb2992e747e941f07f979e88e4
|
|
||||||
size 4959432
|
|
3
libzypp-11.4.0.tar.bz2
Normal file
3
libzypp-11.4.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:d9f83931802ad021de17793b2d624970e027b0c397962993e533a51e35771724
|
||||||
|
size 4961156
|
@ -1,3 +1,18 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Apr 16 14:52:35 CEST 2012 - ma@suse.de
|
||||||
|
|
||||||
|
- ResStatus: add 'unneeded' bit (determined by solver)
|
||||||
|
- Force using gcc-4.6 until it builds with 4.7
|
||||||
|
- Support multiversion definitions being read from files in /etc/zypp/multiversion.d.
|
||||||
|
- Workaround doxygen SEGV and accept incomplete docs (until bnc#755402 is fixed)
|
||||||
|
- Rename zypp::sat::AttrMatcher to zypp::StrMatcher (base/StrMatcher.h)
|
||||||
|
- Support (source)package download by non-root user (bnc#755239)
|
||||||
|
- Delay construction of ZYppGlobalLock until its actually needed (bnc#575096)
|
||||||
|
- Fix buddy handling in solver results
|
||||||
|
- Simplify Selectable::multiversionInstall
|
||||||
|
- Don't cache defaultCandidate as it depends on solver::allowVendorChange flag (bnc#754286)
|
||||||
|
- version 11.4.0 (4)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Apr 10 12:11:37 CEST 2012 - ma@suse.de
|
Tue Apr 10 12:11:37 CEST 2012 - ma@suse.de
|
||||||
|
|
||||||
|
15
libzypp.spec
15
libzypp.spec
@ -16,6 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# norootforbuild
|
# norootforbuild
|
||||||
|
%define force_gcc_46 1
|
||||||
|
|
||||||
|
|
||||||
Name: libzypp
|
Name: libzypp
|
||||||
@ -23,7 +24,7 @@ License: GPL-2.0+
|
|||||||
Group: System/Packages
|
Group: System/Packages
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Summary: Package, Patch, Pattern, and Product Management
|
Summary: Package, Patch, Pattern, and Product Management
|
||||||
Version: 11.3.0
|
Version: 11.4.0
|
||||||
Release: 1
|
Release: 1
|
||||||
Source: %{name}-%{version}.tar.bz2
|
Source: %{name}-%{version}.tar.bz2
|
||||||
Source1: %{name}-rpmlintrc
|
Source1: %{name}-rpmlintrc
|
||||||
@ -52,7 +53,11 @@ BuildRequires: hal-devel
|
|||||||
BuildRequires: boost-devel
|
BuildRequires: boost-devel
|
||||||
BuildRequires: dejagnu
|
BuildRequires: dejagnu
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
|
%if %0%{?force_gcc_46}
|
||||||
|
BuildRequires: gcc-c++ = 4.6
|
||||||
|
%else
|
||||||
BuildRequires: gcc-c++ >= 4.6
|
BuildRequires: gcc-c++ >= 4.6
|
||||||
|
%endif
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
BuildRequires: graphviz
|
BuildRequires: graphviz
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
@ -202,6 +207,10 @@ Authors:
|
|||||||
%build
|
%build
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
|
%if %0%{?force_gcc_46}
|
||||||
|
export CC=gcc-4.6
|
||||||
|
export CXX=g++-4.6
|
||||||
|
%endif
|
||||||
export CFLAGS="$RPM_OPT_FLAGS"
|
export CFLAGS="$RPM_OPT_FLAGS"
|
||||||
export CXXFLAGS="$RPM_OPT_FLAGS"
|
export CXXFLAGS="$RPM_OPT_FLAGS"
|
||||||
unset TRANSLATION_SET
|
unset TRANSLATION_SET
|
||||||
@ -245,6 +254,8 @@ ln -s %{_sysconfdir}/yum.repos.d $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
|
|||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
|
||||||
%endif
|
%endif
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/services.d
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/services.d
|
||||||
|
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
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins
|
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/commit
|
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/commit
|
||||||
@ -338,6 +349,8 @@ rm -rf "$RPM_BUILD_ROOT"
|
|||||||
%dir %{_sysconfdir}/zypp/repos.d
|
%dir %{_sysconfdir}/zypp/repos.d
|
||||||
%endif
|
%endif
|
||||||
%dir %{_sysconfdir}/zypp/services.d
|
%dir %{_sysconfdir}/zypp/services.d
|
||||||
|
%dir %{_sysconfdir}/zypp/vendors.d
|
||||||
|
%dir %{_sysconfdir}/zypp/multiversion.d
|
||||||
%config(noreplace) %{_sysconfdir}/zypp/zypp.conf
|
%config(noreplace) %{_sysconfdir}/zypp/zypp.conf
|
||||||
%config(noreplace) %{_sysconfdir}/zypp/systemCheck
|
%config(noreplace) %{_sysconfdir}/zypp/systemCheck
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr
|
%config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr
|
||||||
|
Loading…
Reference in New Issue
Block a user