Author: mlandres Date: Thu Sep 25 12:03:23 2008 New Revision: 11158 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11158&view=rev Log: Dont claim ownership of /var/log/zypp/history. Fix to build. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/libzypp.spec.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11158&r1=11157&r2=11158&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Sep 25 12:03:23 2008 @@ -61,7 +61,7 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "12") SET(LIBZYPP_MINOR "12") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # # LAST RELEASED: 5.12.0 (12) # (The number in parenthesis is LIBZYPP_COMPATMINOR) Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=11158&r1=11157&r2=11158&view=diff ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Thu Sep 25 12:03:23 2008 @@ -120,8 +120,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/zypp/repos.d mkdir -p $RPM_BUILD_ROOT/etc/zypp/products.d mkdir -p $RPM_BUILD_ROOT/etc/zypp/services.d -mkdir -p $RPM_BUILD_ROOT/var/lib/zypp -mkdir -p $RPM_BUILD_ROOT/var/cache/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 @@ -207,11 +208,11 @@ %defattr(-,root,root) %dir /etc/zypp %dir /etc/zypp/repos.d -%dir /etc/zypp/products.d %config(noreplace) /etc/zypp/zypp.conf %config(noreplace) /etc/zypp/systemCheck -%dir /var/lib/zypp -%dir /var/cache/zypp +%dir %{_var}/lib/zypp +%dir %{_var}/log/zypp +%dir %{_var}/cache/zypp %{prefix}/lib/zypp %{prefix}/share/zypp %{prefix}/share/applications/package-manager.desktop @@ -225,20 +226,14 @@ %{prefix}/bin/package-manager-su %{_libdir}/libzypp*so.* %doc %_mandir/man5/locks.5.* +%{_sysconfdir}/logrotate.d/zypp-history.lr %files devel %defattr(-,root,root) %{_libdir}/libzypp.so -#%dir %{_libdir}/libzypp.la %{_docdir}/%{name} -%dir %{prefix}/include/zypp -%{prefix}/include/zypp/* +%{prefix}/include/zypp %{prefix}/share/cmake/Modules/* %{_libdir}/pkgconfig/libzypp.pc -%dir %{_var}/log/zypp -# declare ownership of the log file but prevent -# it from being erased by rpm -e -%ghost %config(noreplace) %{_var}/log/zypp/history -%{_sysconfdir}/logrotate.d/zypp-history.lr %changelog Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11158&r1=11157&r2=11158&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Sep 25 12:03:23 2008 @@ -6,7 +6,7 @@ history.logfile (/var/log/zypp/history) (fate #110205) - str::escape(string, char) added - revision 11150 -- version 5.12.0 (12) +- version 5.12.1 (12) ------------------------------------------------------------------- Tue Sep 23 14:02:08 CEST 2008 - jkupec@suse.cz -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org