Hello community, here is the log from the commit of package kde4-filesystem checked in at Tue Dec 4 00:15:47 CET 2007. -------- --- KDE/kde4-filesystem/kde4-filesystem.changes 2007-11-28 10:59:43.000000000 +0100 +++ /mounts/work_src_done/NOARCH/kde4-filesystem/kde4-filesystem.changes 2007-12-03 11:11:04.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 3 11:10:57 CET 2007 - dmueller@suse.de + +- bump version to 3.96.2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.T26903/_old 2007-12-04 00:12:09.000000000 +0100 +++ /var/tmp/diff_new_pack.T26903/_new 2007-12-04 00:12:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kde4-filesystem (Version 3.96.1) +# spec file for package kde4-filesystem (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: kde4-filesystem Url: http://www.kde.org -Version: 3.96.1 +Version: 3.96.2 Release: 1 License: LGPL v2.1 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -75,6 +75,8 @@ %endif %changelog +* Mon Dec 03 2007 - dmueller@suse.de +- bump version to 3.96.2 * Wed Nov 28 2007 - dmueller@suse.de - update vresion to 3.96.1 - add platform version macro ++++++ macros.kde4 ++++++ --- KDE/kde4-filesystem/macros.kde4 2007-11-21 18:11:08.000000000 +0100 +++ /mounts/work_src_done/NOARCH/kde4-filesystem/macros.kde4 2007-12-01 12:29:46.000000000 +0100 @@ -9,7 +9,7 @@ %kde4_runtime_requires Requires: kdebase4-runtime >= %_kde_platform_version -%_kde_build_type debug +%_kde_build_type release %cmake_kde4(d:) \ export CFLAGS=$RPM_OPT_FLAGS \ @@ -22,9 +22,8 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_kde_prefix} -DLIB_SUFFIX="$_kde_libsuffix" -DCMAKE_BUILD_TYPE=%{_kde_build_type} $bdir \ %{nil} -%create_subdir_filelist(d:n:f:o:) \ +%create_subdir_filelist(d:f:o:v:) \ %{!-d:echo -e "\\nERROR: missing parameter for macro create_subdir_filelist\\n" ; exit 1 ; } \ - filelistdir=%{-n:%{-n*}}%{!-n:%{name}} \ filelist=%{-f:%{-f*}}%{!-f:%{-d*}} \ if test -e doc/%{-d*}; then \ pushd doc/%{-d*} \ @@ -33,25 +32,44 @@ fi \ pushd %{-d*} \ make DESTDIR=$RPM_BUILD_ROOT.%{-d*} install \ - mkdir -p $RPM_BUILD_DIR/$filelistdir/filelists \ - echo "%defattr(-,root,root,755)" >>$RPM_BUILD_DIR/$filelistdir/filelists/$filelist \ + 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/$filelistdir/filelists/$filelist.devel \ - find $RPM_BUILD_ROOT.%{-d*}/usr/include -type f | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/$filelistdir/filelists/$filelist.devel \ - find $RPM_BUILD_ROOT.%{-d*}/usr/include -type l | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/$filelistdir/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/$filelistdir/filelists/$filelist.devel \ - find $RPM_BUILD_ROOT.%{-d*} -type l -name *.so | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/$filelistdir/filelists/$filelist.devel \ - cat $RPM_BUILD_DIR/$filelistdir/filelists/$filelist.devel | while read line; do echo "%exclude $line";done >>$RPM_BUILD_DIR/$filelistdir/filelists/$filelist \ + 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 \ - 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/$filelistdir/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/$filelistdir/filelists/$filelist; fi \ - find $RPM_BUILD_ROOT.%{-d*} -type f | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/$filelistdir/filelists/$filelist \ - find $RPM_BUILD_ROOT.%{-d*} -type l | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/$filelistdir/filelists/$filelist \ - sed -ri "s,^/usr/share/doc/kde/HTML/(.[^/])/,%doc %lang(\\1) /usr/share/doc/kde/HTML/\\1/," $RPM_BUILD_DIR/$filelistdir/filelists/$filelist \ + # 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*} \ + find $RPM_BUILD_ROOT.%{-d*}/usr/include -type l | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/%{-v*} \ + find $RPM_BUILD_ROOT.%{-d*}/usr/share/kde4/apps/cmake/modules -type f | sed s,$RPM_BUILD_ROOT.%{-d*},, >>$RPM_BUILD_DIR/%buildsubdir/filelists/%{-v*} \ + 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 \ + 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 \ 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 + popd \ +%{nil} + +%__spec_clean_post %{__spec_clean_post}; rm -rf filelists %kde_post_install \ if test -e /usr/lib/rpm/suse_update_desktop_file.sh; then \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org