Hello community, here is the log from the commit of package kde4-filesystem checked in at Wed Jul 9 17:10:25 CEST 2008. -------- --- KDE/kde4-filesystem/kde4-filesystem.changes 2008-06-26 17:50:13.000000000 +0200 +++ kde4-filesystem/kde4-filesystem.changes 2008-07-08 22:31:44.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Jul 4 14:31:07 CEST 2008 - dmueller@suse.de + +- bump version to 4.0.85 + +------------------------------------------------------------------- +Fri Jul 4 13:43:55 CEST 2008 - schwab@suse.de + +- Fix infinite loop. +- Rewrite %create_subdir_filelist macro. + +------------------------------------------------------------------- +Thu Jul 3 06:59:53 CEST 2008 - dmueller@suse.de + +- no longer noarch, list kde4 plugin dirs + +------------------------------------------------------------------- +Mon Jun 30 11:17:58 CEST 2008 - dmueller@suse.de + +- make the build verbose (bnc#403687) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.M31336/_old 2008-07-09 17:10:11.000000000 +0200 +++ /var/tmp/diff_new_pack.M31336/_new 2008-07-09 17:10:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kde4-filesystem (Version 4.0.84) +# spec file for package kde4-filesystem (Version 4.0.85) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: kde4-filesystem Url: http://www.kde.org -Version: 4.0.84 +Version: 4.0.85 Release: 1 License: LGPL v2.1 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -21,7 +21,6 @@ Summary: KDE4 Directory Layout Source0: macros.kde4 Source1: COPYING -BuildArch: noarch Provides: kde4-fsview = 3.93.0.svn712059 Obsoletes: kde4-fsview <= 3.93.0.svn712059 Provides: kdeaddons4 = 3.93.0.svn712059 @@ -112,6 +111,9 @@ done done done + mkdir -p $RPM_BUILD_ROOT/%_libdir/kde4 + mkdir -p $RPM_BUILD_ROOT/%_libdir/kde4/libexec + mkdir -p $RPM_BUILD_ROOT/%_libdir/kde4/plugins mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/services/phononbackends mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/services/ServiceMenus mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/apps @@ -138,11 +140,21 @@ /usr/share/icons/* /usr/share/applications/kde4 /usr/share/kde4/services/phononbackends +%_libdir/kde4 %if %suse_version <= 1030 /usr/share/dbus-1/interfaces %endif %changelog +* Fri Jul 04 2008 dmueller@suse.de +- bump version to 4.0.85 +* Fri Jul 04 2008 schwab@suse.de +- Fix infinite loop. +- Rewrite %%create_subdir_filelist macro. +* Thu Jul 03 2008 dmueller@suse.de +- no longer noarch, list kde4 plugin dirs +* Mon Jun 30 2008 dmueller@suse.de +- make the build verbose (bnc#403687) * Thu Jun 26 2008 dmueller@suse.de - bump version to 4.0.84 * Tue Jun 24 2008 dmueller@suse.de ++++++ macros.kde4 ++++++ --- KDE/kde4-filesystem/macros.kde4 2008-06-26 17:50:15.000000000 +0200 +++ kde4-filesystem/macros.kde4 2008-07-08 22:31:45.000000000 +0200 @@ -5,8 +5,8 @@ %_kde_config_dir %{_kde_share_dir}/config %_kde_html_dir %{_prefix}/share/doc/kde/HTML -%_kde_platform_version 4.0.84 -%_kde_pimlibs_version 4.0.84 +%_kde_platform_version 4.0.85 +%_kde_pimlibs_version 4.0.85 %_kde_akonadi_version 0.82 %kde4_runtime_requires Requires: kdebase4-runtime >= %_kde_platform_version @@ -40,34 +40,41 @@ pushd %{-d*} \ make DESTDIR=$RPM_BUILD_ROOT.%{-d*} install \ mkdir -p $RPM_BUILD_DIR/%buildsubdir/filelists \ - echo "%defattr(-,root,root,755)" >>$RPM_BUILD_DIR/%buildsubdir/filelists/$filelist \ - \ - if test -n "%{-v*}"; then \ - devel_filelist=%{-v*} \ - devel_filelist=${devel_filelist#*/} \ - echo "%defattr(-,root,root,755)" >>$RPM_BUILD_DIR/%buildsubdir/filelists/$devel_filelist \ - find $RPM_BUILD_ROOT.%{-d*}/usr/include -type f | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/$devel_filelist \ - find $RPM_BUILD_ROOT.%{-d*}/usr/include -type l | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/$devel_filelist \ - find $RPM_BUILD_ROOT.%{-d*}/usr/share/kde4/apps/cmake/modules -type f | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/$devel_filelist \ - find $RPM_BUILD_ROOT.%{-d*} -type l -name *.so | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/$devel_filelist \ - cat $RPM_BUILD_DIR/%buildsubdir/filelists/$devel_filelist | 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 \ - 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 \ + { \ + echo "%%defattr(-,root,root,755)" \ + if test -n "%{-v*}"; then \ + devel_filelist=%{-v*} \ + devel_filelist=${devel_filelist#*/} \ + { \ + echo "%%defattr(-,root,root,755)" \ + find $RPM_BUILD_ROOT.%{-d*} \\( \\\ + -path "$RPM_BUILD_ROOT.%{-d*}/usr/include/*" \\( -type f -o -type l \\) -o \\\ + -path "$RPM_BUILD_ROOT.%{-d*}/usr/share/kde4/apps/cmake/modules/*" -type f -o \\\ + -name *.so -type l \\) -printf "/%%P\\n" \ + } | tee -a $RPM_BUILD_DIR/%buildsubdir/filelists/$devel_filelist | \ + sed -e '/^%%defattr/d' -e 's/^/%%exclude /' \ + fi \ + find $RPM_BUILD_ROOT.%{-d*} \\\ + \\( -path "$RPM_BUILD_ROOT.%{-d*}/usr/share/doc/kde/HTML/en/%{-d*}" -o \\\ + -path "$RPM_BUILD_ROOT.%{-d*}/usr/share/doc/kde/HTML/en/%{-d*}/*" -o \\\ + -path "$RPM_BUILD_ROOT.%{-d*}/usr/share/kde4/apps/%{-d*}" -o \\\ + -path "$RPM_BUILD_ROOT.%{-d*}/usr/share/kde4/apps/%{-d*}/*" \\) \\\ + -type d -printf "%%dir /%%P\\n" -o \\\ + \\( -type f -o -type l \\) -printf "/%%P\\n" \ + } | \ + sed -r "s,^/usr/share/doc/kde/HTML/(.[^/])/,%%doc %%lang(\\1) &," >> $RPM_BUILD_DIR/%buildsubdir/filelists/$filelist \ rm -rf $RPM_BUILD_ROOT.%{-d*} \ popd \ %{nil} %create_exclude_filelist \ pushd $RPM_BUILD_DIR/%buildsubdir/ \ - cat filelists/* | while read line; do echo "%exclude $line";done >filelists/exclude + for f in filelists/*; do \ + case $f in \ + filelists/exclude) ;; \ + *) sed -e '/^%%defattr/d' -e 's/^%%exclude //' -e 's/^/%%exclude /' "$f";; \ + esac \ + done >filelists/exclude \ popd \ %{nil} @@ -92,5 +99,5 @@ %{nil} %make_jobs \ - %{__make} %{?jobs:-j %{jobs}} + %{__make} %{?jobs:-j %{jobs}} VERBOSE=1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org