Accepting request 40491 from zypp:Head

Copy from zypp:Head/libzypp based on submit request 40491 from user mlandres OBS-URL: https://build.opensuse.org/request/show/40491 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=207
2010-05-25 11:28:01 +00:00 · 2010-05-25 11:28:01 +00:00 · b0ada52680
commit b0ada52680
parent 42ba962278
4 changed files with 100 additions and 48 deletions
--- a/libzypp-7.6.0.tar.bz2
+++ b/libzypp-7.6.0.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e647b1fe14a9fe0d39233f83d70c206a0824817007dcdd7e7b526ee14c1bcbf2
-size 4968570
--- a/libzypp-7.7.2.tar.bz2
+++ b/libzypp-7.7.2.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e825dfa2d53ed1fa095751f5445510c53f2e5ae2168b6b10aa1ce189213315fc
+size 4972785
--- a/libzypp.changes
+++ b/libzypp.changes
@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Fri May 21 20:00:55 CEST 2010 - ma@suse.de
+
+- Fix broken IdStringType comparison (bnc#607572)
+- version 7.7.2 (6)
+
+-------------------------------------------------------------------
+Thu May 20 21:01:05 CEST 2010 - ma@suse.de
+
+- Fix packages provided via delta rpm being placed in 
+  the wrong package cache (bnc#607583)
+- version 7.7.1 (6)
+
+-------------------------------------------------------------------
+Thu May 20 01:13:49 CEST 2010 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Tue May 18 18:02:44 CEST 2010 - ma@suse.de
+
+- Fix arch detection on sprac (bug #566291)
+- Arch: add sparc64v and sparcv9v and armv7l
+- RepoManager: refresh repo if last refresh is in the future (bnc#593617)
+- version 7.6.1 (6)
+
+-------------------------------------------------------------------
+Mon May 17 15:25:14 CEST 2010 - ma@suse.de
+
+- Fix package-manager-su to support LXDE (Andrea Florio) (bnc#582235)
+- Cleanup spec file (Pavol Rusnak)
+- version 7.6.0 (6)
+
+-------------------------------------------------------------------
+Sun May 16 01:13:39 CEST 2010 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
 -------------------------------------------------------------------
 Wed May 12 19:09:54 CEST 2010 - ma@suse.de

--- a/libzypp.spec
+++ b/libzypp.spec
@ -1,5 +1,5 @@
 #
-# spec file for package libzypp (Version 7.6.0)
+# spec file for package libzypp (Version 7.7.2)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@ -22,13 +22,11 @@ Name:           libzypp
 License:        GPLv2+
 Group:          System/Packages
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-AutoReqProv:    on
 Summary:        Package, Patch, Pattern, and Product Management
-Version:        7.6.0
+Version:        7.7.2
 Release:        1
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
-Prefix:         /usr
 Provides:       yast2-packagemanager
 Obsoletes:      yast2-packagemanager
 %if 0%{?suse_version}
@ -37,7 +35,13 @@ Recommends:     logrotate
 BuildRequires:  cmake
 BuildRequires:  openssl-devel
 BuildRequires:  libudev-devel
-BuildRequires:  boost-devel dejagnu doxygen gcc-c++ gettext-devel graphviz libxml2-devel
+BuildRequires:  boost-devel
+BuildRequires:  dejagnu
+BuildRequires:  doxygen
+BuildRequires:  gcc-c++
+BuildRequires:  gettext-devel
+BuildRequires:  graphviz
+BuildRequires:  libxml2-devel

 BuildRequires:  libsatsolver-devel >= 0.14.17
 %if 0%{?suse_version}
@ -56,12 +60,16 @@ BuildRequires:  expat-devel
 %endif

 %if 0%{?suse_version}
-BuildRequires:  hicolor-icon-theme rpm-devel update-desktop-files
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  update-desktop-files
+BuildRequires:  rpm-devel
 Requires:       uuid-runtime
 %endif

 %if 0%{?fedora_version}
-BuildRequires:  glib2-devel popt-devel rpm-devel
+BuildRequires:  glib2-devel
+BuildRequires:  popt-devel
+BuildRequires:  rpm-devel
 %endif

 %if 0%{?mandriva_version}
@ -102,9 +110,9 @@ BuildRequires:  aria2 >= %{min_aria_version}
 # ---------------------------------------------------------------

 %if 0%{?suse_version}
-Requires:       libcurl4   >= %{min_curl_version}
+Requires:       libcurl4 >= %{min_curl_version}
 %else
-Requires:       libcurl   >= %{min_curl_version}
+Requires:       libcurl >= %{min_curl_version}
 %endif
 BuildRequires:  libcurl-devel >= %{min_curl_version}

@ -124,9 +132,16 @@ Authors:

 %package devel
 License:        GPLv2+
-Requires:       libzypp == %{version}
-Requires:       libxml2-devel openssl-devel rpm-devel glibc-devel zlib-devel
-Requires:       bzip2 popt-devel boost-devel libstdc++-devel
+Requires:       libzypp = %{version}
+Requires:       libxml2-devel
+Requires:       openssl-devel
+Requires:       rpm-devel
+Requires:       glibc-devel
+Requires:       zlib-devel
+Requires:       bzip2
+Requires:       popt-devel
+Requires:       boost-devel
+Requires:       libstdc++-devel
 Requires:       libudev-devel
 Requires:       cmake
 Requires:       libcurl-devel >= %{min_curl_version}
@ -161,20 +176,20 @@ Authors:
 mkdir build
 cd build
 export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$CFLAGS"
-cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
+export CXXFLAGS="$RPM_OPT_FLAGS"
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
      -DDOC_INSTALL_DIR=%{_docdir} \
      -DLIB=%{_lib} \
      -DCMAKE_BUILD_TYPE=Release \
      -DCMAKE_SKIP_RPATH=1 \
      %{?use_translation_set:-DUSE_TRANSLATION_SET=%use_translation_set} \
      ..
-make %{?jobs:-j %jobs} VERBOSE=1
-make -C doc/autodoc %{?jobs:-j %jobs}
-make -C po %{?jobs:-j %jobs} translations
+make %{?_smp_mflags} VERBOSE=1
+make -C doc/autodoc %{?_smp_mflags}
+make -C po %{?_smp_mflags} translations

 %if 0%{?run_testsuite}
-  make -C tests %{?jobs:-j %jobs}
+  make -C tests %{?_smp_mflags}
  pushd tests
  LD_LIBRARY_PATH=$PWD/../zypp:$LD_LIBRARY_PATH ctest .
  popd
@ -187,12 +202,12 @@ rm -rf "$RPM_BUILD_ROOT"
 cd build
 make install DESTDIR=$RPM_BUILD_ROOT
 make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/zypp/repos.d
-mkdir -p $RPM_BUILD_ROOT/etc/zypp/services.d
-mkdir -p $RPM_BUILD_ROOT/%{_usr}/lib/zypp
-mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/zypp
-mkdir -p $RPM_BUILD_ROOT/%{_var}/log/zypp
-mkdir -p $RPM_BUILD_ROOT/%{_var}/cache/zypp
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/services.d
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp
+mkdir -p $RPM_BUILD_ROOT%{_var}/lib/zypp
+mkdir -p $RPM_BUILD_ROOT%{_var}/log/zypp
+mkdir -p $RPM_BUILD_ROOT%{_var}/cache/zypp

 %if 0%{?suse_version}
 %suse_update_desktop_file -G "" -C "" package-manager
@ -210,8 +225,8 @@ if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi
 # convert old lock file to new
 # TODO make this a separate file?
 # TODO run the sript only when updating form pre-11.0 libzypp versions
-LOCKSFILE=/etc/zypp/locks
-OLDLOCKSFILE=/etc/zypp/locks.old
+LOCKSFILE=%{_sysconfdir}/zypp/locks
+OLDLOCKSFILE=%{_sysconfdir}/zypp/locks.old

 is_old(){
  # if no such file, exit with false (1 in bash)
@ -274,35 +289,34 @@ rm -rf "$RPM_BUILD_ROOT"

 %files -f zypp.lang
 %defattr(-,root,root)
-%dir               /etc/zypp
-%dir               /etc/zypp/repos.d
-%dir               /etc/zypp/services.d
-%config(noreplace) /etc/zypp/zypp.conf
-%config(noreplace) /etc/zypp/systemCheck
+%dir               %{_sysconfdir}/zypp
+%dir               %{_sysconfdir}/zypp/repos.d
+%dir               %{_sysconfdir}/zypp/services.d
+%config(noreplace) %{_sysconfdir}/zypp/zypp.conf
+%config(noreplace) %{_sysconfdir}/zypp/systemCheck
 %config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr
-                   %{_usr}/lib/zypp
 %dir               %{_var}/lib/zypp
 %dir               %{_var}/log/zypp
 %dir               %{_var}/cache/zypp
-%dir               %{prefix}/lib/zypp
-%{prefix}/share/zypp
-%{prefix}/share/applications/package-manager.desktop
-%{prefix}/share/icons/hicolor/scalable/apps/package-manager-icon.svg
-%{prefix}/share/icons/hicolor/16x16/apps/package-manager-icon.png
-%{prefix}/share/icons/hicolor/22x22/apps/package-manager-icon.png
-%{prefix}/share/icons/hicolor/24x24/apps/package-manager-icon.png
-%{prefix}/share/icons/hicolor/32x32/apps/package-manager-icon.png
-%{prefix}/share/icons/hicolor/48x48/apps/package-manager-icon.png
-%{prefix}/bin/*
+%{_prefix}/lib/zypp
+%{_datadir}/zypp
+%{_datadir}/applications/package-manager.desktop
+%{_datadir}/icons/hicolor/scalable/apps/package-manager-icon.svg
+%{_datadir}/icons/hicolor/16x16/apps/package-manager-icon.png
+%{_datadir}/icons/hicolor/22x22/apps/package-manager-icon.png
+%{_datadir}/icons/hicolor/24x24/apps/package-manager-icon.png
+%{_datadir}/icons/hicolor/32x32/apps/package-manager-icon.png
+%{_datadir}/icons/hicolor/48x48/apps/package-manager-icon.png
+%{_bindir}/*
 %{_libdir}/libzypp*so.*
-%doc %_mandir/man5/locks.5.*
+%doc %{_mandir}/man5/locks.5.*

 %files devel
 %defattr(-,root,root)
 %{_libdir}/libzypp.so
 %{_docdir}/%{name}
-%{prefix}/include/zypp
-%{prefix}/share/cmake/Modules/*
+%{_includedir}/zypp
+%{_datadir}/cmake/Modules/*
 %{_libdir}/pkgconfig/libzypp.pc

 %changelog