Hello community, here is the log from the commit of package kde4-filesystem checked in at Mon Apr 21 18:35:44 CEST 2008. -------- --- KDE/kde4-filesystem/kde4-filesystem.changes 2008-04-14 16:04:40.000000000 +0200 +++ /mounts/work_src_done/NOARCH/kde4-filesystem/kde4-filesystem.changes 2008-04-21 15:56:31.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 21 15:54:16 CEST 2008 - dmueller@suse.de + +- fix libakonadi1 obsolete +- stricter requirements to reject UNSTABLE tree packages +- fix filelist macro to not list files twice + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.J10015/_old 2008-04-21 18:33:45.000000000 +0200 +++ /var/tmp/diff_new_pack.J10015/_new 2008-04-21 18:33:45.000000000 +0200 @@ -14,7 +14,7 @@ Name: kde4-filesystem Url: http://www.kde.org Version: 4.0.3 -Release: 7 +Release: 9 License: LGPL v2.1 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/GUI/KDE @@ -56,7 +56,7 @@ Obsoletes: kde4-kalarm <= 4.0 Obsoletes: kde4-kaddressbook <= 4.0 Obsoletes: kde4-ktimetracker <= 4.0 -Obsoletes: libakonadi1 <= 4.0 +Obsoletes: libakonadi1 <= 4.0.65 Obsoletes: libkdepim4-devel <= 4.0 Obsoletes: kdepim4-wizards <= 4.0 Obsoletes: kde4-kmail <= 4.0 @@ -133,6 +133,10 @@ %endif %changelog +* Mon Apr 21 2008 dmueller@suse.de +- fix libakonadi1 obsolete +- stricter requirements to reject UNSTABLE tree packages +- fix filelist macro to not list files twice * Mon Apr 14 2008 dmueller@suse.de - add kdepimlibs requires - add color-schemes dir ++++++ macros.kde4 ++++++ --- KDE/kde4-filesystem/macros.kde4 2008-04-14 08:33:26.000000000 +0200 +++ /mounts/work_src_done/NOARCH/kde4-filesystem/macros.kde4 2008-04-17 13:50:22.000000000 +0200 @@ -8,7 +8,7 @@ %_kde_platform_version 4.0.3 %_kde_pimlibs_version 4.0.69 -%kde4_runtime_requires Requires: kdebase4-runtime >= %_kde_platform_version +%kde4_runtime_requires Requires: kdebase4-runtime >= %_kde_platform_version kdebase4-runtime < 4.0.60 %kde4_pimlibs_requires Requires: libakonadi4 >= %_kde_pimlibs_version libkdepimlibs4 >= %_kde_pimlibs_version %_kde_build_type release @@ -38,17 +38,6 @@ mkdir -p $RPM_BUILD_DIR/%buildsubdir/filelists \ echo "%defattr(-,root,root,755)" >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist \ \ - # legacy support for "-o devel", to be removed \ - if test "%{-o*}" = "devel"; then \ - echo "%defattr(-,root,root,755)" >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist.devel \ - find $RPM_BUILD_ROOT.%{-d*}/usr/include -type f | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist.devel \ - find $RPM_BUILD_ROOT.%{-d*}/usr/include -type l | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist.devel \ - find $RPM_BUILD_ROOT.%{-d*}/usr/share/kde4/apps/cmake/modules -type f | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist.devel \ - find $RPM_BUILD_ROOT.%{-d*} -type l -name *.so | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist.devel \ - cat $RPM_BUILD_DIR/%buildsubdir/filelists/$filelist.devel | while read line; do echo "%exclude $line";done >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist \ - fi \ - # end of legacy support \ - \ if test -n "%{-v*}"; then \ echo "%defattr(-,root,root,755)" >>$RPM_BUILD_DIR/%buildsubdir/filelists/%{-v*} \ find $RPM_BUILD_ROOT.%{-d*}/usr/include -type f | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/%{-v*} \ @@ -57,8 +46,12 @@ find $RPM_BUILD_ROOT.%{-d*} -type l -name *.so | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/%{-v*} \ cat $RPM_BUILD_DIR/%buildsubdir/filelists/%{-v*} | while read line; do echo "%exclude $line";done >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist \ fi \ - if test -e $RPM_BUILD_ROOT.%{-d*}/usr/share/doc/kde/HTML/en/%{-d*}; then echo "%dir /usr/share/doc/kde/HTML/en/%{-d*}" >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist; fi \ - if test -e $RPM_BUILD_ROOT.%{-d*}/usr/share/kde4/apps/%{-d*}; then echo "/usr/share/kde4/apps/%{-d*}" >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist; fi \ + if test -e $RPM_BUILD_ROOT.%{-d*}/usr/share/doc/kde/HTML/en/%{-d*}; then \ + find $RPM_BUILD_ROOT.%{-d*}/usr/share/doc/kde/HTML/en/%{-d*} -type d | sed "s,$RPM_BUILD_ROOT.%{-d*},%dir ," >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist \ + fi \ + if test -e $RPM_BUILD_ROOT.%{-d*}/usr/share/kde4/apps/%{-d*}; then \ + find $RPM_BUILD_ROOT.%{-d*}/usr/share/kde4/apps/%{-d*} -type d | sed "s,$RPM_BUILD_ROOT.%{-d*},%dir ," >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist \ + fi \ find $RPM_BUILD_ROOT.%{-d*} -type f | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist \ find $RPM_BUILD_ROOT.%{-d*} -type l | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist \ sed -ri "s,^/usr/share/doc/kde/HTML/(.[^/])/,%doc %lang(\\1) /usr/share/doc/kde/HTML/\\1/," $RPM_BUILD_DIR/%buildsubdir/filelists/$filelist \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org