Accepting request 114922 from zypp:Head
We should have a working / building libzypp in Factory too... OBS-URL: https://build.opensuse.org/request/show/114922 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=272
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
6407addd46
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e5b6ef1d7932cc1a403a1b766d27d117b7740a0134ccab7fe499acf775061250
|
||||
size 5020882
|
||||
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:e6ba725c56ab939693443a6012b41bb62109b8ef26c305b3784bab2d28633b7a
|
||||
size 4961072
|
||||
@ -1,3 +1,72 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 19 10:19:05 CEST 2012 - ma@suse.de
|
||||
|
||||
- Always consider (block) devices passed as url option (bnc#755815)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 19 01:14:57 CEST 2012 - ma@suse.de
|
||||
|
||||
- Update zypp-po.tar.bz2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 18 18:38:06 CEST 2012 - ma@suse.de
|
||||
|
||||
- Fix install progress hopping back and forth
|
||||
- Try to create a missing destination dir before switching to tmp
|
||||
space (bnc#755239)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- Update zypp-po.tar.bz2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 8 01:13:24 CEST 2012 - ma@suse.de
|
||||
|
||||
- Update zypp-po.tar.bz2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 5 01:16:21 CEST 2012 - ma@suse.de
|
||||
|
||||
- Update zypp-po.tar.bz2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 26 14:47:59 CEST 2012 - ma@suse.de
|
||||
|
||||
- Cleanup orphaned media attach points (bnc#751221)
|
||||
- Show max support status if package is in multiple repos (bnc#735841)
|
||||
- Parse proxy user/pass from url (bnc#752497)
|
||||
- Add CMake option to disable libproxy usage and disable it on SLE. (bnc#752500)
|
||||
- version 11.3.0 (1)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 15 00:31:25 CET 2012 - ma@suse.de
|
||||
|
||||
- Add API for patch severity (bnc#733723, FATE#312633)
|
||||
- version 11.2.0 (1)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 13 13:04:48 CET 2012 - ma@suse.de
|
||||
|
||||
- Force libproxy into using "/etc/sysconfig/proxy" if it exists (bnc#679322)
|
||||
- Apply soft locks by name and not per package (bnc#749418)
|
||||
- version 11.1.1 (1)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 3 13:18:01 CET 2012 - ma@suse.de
|
||||
|
||||
|
||||
21
libzypp.spec
21
libzypp.spec
@ -16,6 +16,7 @@
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
%define force_gcc_46 1
|
||||
|
||||
|
||||
Name: libzypp
|
||||
@ -23,7 +24,7 @@ License: GPL-2.0+
|
||||
Group: System/Packages
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Summary: Package, Patch, Pattern, and Product Management
|
||||
Version: 11.1.0
|
||||
Version: 11.4.0
|
||||
Release: 1
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: %{name}-rpmlintrc
|
||||
@ -52,11 +53,18 @@ BuildRequires: hal-devel
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: dejagnu
|
||||
BuildRequires: doxygen
|
||||
%if 0%{?force_gcc_46}
|
||||
BuildRequires: gcc-c++ = 4.6
|
||||
%else
|
||||
BuildRequires: gcc-c++ >= 4.6
|
||||
%endif
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: libxml2-devel
|
||||
%if 0%{?suse_version} != 1110
|
||||
# No libproxy on SLES
|
||||
BuildRequires: libproxy-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
|
||||
BuildRequires: pkgconfig
|
||||
@ -199,13 +207,19 @@ Authors:
|
||||
%build
|
||||
mkdir 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 CXXFLAGS="$RPM_OPT_FLAGS"
|
||||
unset TRANSLATION_SET
|
||||
unset EXTRA_CMAKE_OPTIONS
|
||||
# SLE11-* might want its own translation set:
|
||||
%if 0%{?suse_version} == 1110
|
||||
if [ -f ../po/sle-zypp-po.tar.bz ]; then
|
||||
export TRANSLATION_SET=sle-zypp
|
||||
export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
|
||||
fi
|
||||
%endif
|
||||
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||
@ -214,6 +228,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_SKIP_RPATH=1 \
|
||||
-DUSE_TRANSLATION_SET=${TRANSLATION_SET:-zypp} \
|
||||
${EXTRA_CMAKE_OPTIONS} \
|
||||
..
|
||||
make %{?_smp_mflags} VERBOSE=1
|
||||
make -C doc/autodoc %{?_smp_mflags}
|
||||
@ -239,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
|
||||
%endif
|
||||
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/plugins
|
||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/commit
|
||||
@ -332,6 +349,8 @@ rm -rf "$RPM_BUILD_ROOT"
|
||||
%dir %{_sysconfdir}/zypp/repos.d
|
||||
%endif
|
||||
%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/systemCheck
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user