Hello community, here is the log from the commit of package kde4-filesystem for openSUSE:Factory checked in at Tue Oct 18 14:16:55 CEST 2011.
-------- --- openSUSE:Factory/kde4-filesystem/kde4-filesystem.changes 2011-10-06 16:15:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/kde4-filesystem/kde4-filesystem.changes 2011-10-07 10:30:22.000000000 +0200 @@ -1,0 +2,32 @@ +Fri Oct 7 10:10:34 UTC 2011 - [email protected] + +- Cleaned up obsoletes: + * Added provides for obsoletes (fix for RPMLINT warning) + * Bumped obsolete versions to next stable KDE release + (so i.e. 4.0.83 becomes 4.1) + * Sorted by version number then name + * Cleaned up indenting so it is easier to see which packages + were removed at the same time + * Removed some redundant obsoletes (fix for RPMLINT warning) +- Added obsoletes/provides for packages removed or renamed for 4.7.1: + * kbattleship + * kdeartwork4 + * kdegames4 + * kdemultimedia4 + * kdenetwork4 + * kdesdk4 + * kdetoys4 + * kdeutils4 + * klines + * ktron + * ktuberling +- Made macros that were duplicates of standard macros use the + standard macro directly. This is particularly important for the + %_kde_mandir macro, since it means all files in this directory + automatically get the %doc tag without needing to explicitly set + it. IMPORTANT: none of these changes actually change the contents + of the macros or where the files are stored +- Cleaned up spec file formatting +- Cleaned up macros file formatting + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.SipyDl/_old 2011-10-18 14:16:52.000000000 +0200 +++ /var/tmp/diff_new_pack.SipyDl/_new 2011-10-18 14:16:52.000000000 +0200 @@ -15,9 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: kde4-filesystem Url: http://www.kde.org Version: 4.7.2 @@ -28,54 +25,96 @@ Summary: KDE4 Directory Layout Source0: macros.kde4 Source1: COPYING -Provides: kde4-fsview = 3.93.0.svn712059 -Obsoletes: kde4-fsview <= 3.93.0.svn712059 -Provides: kdeaddons4 = 3.93.0.svn712059 -Obsoletes: kdeaddons4 <= 3.93.0.svn712059 -Provides: kdeaddons4-kicker = 3.93.0 -Obsoletes: kdeaddons4-kicker <= 3.93.0 -Provides: kdeaddons4-knewsticker = 3.93.0.svn712059 -Obsoletes: kdeaddons4-knewsticker <= 3.93.0.svn712059 -Provides: kdeaddons4-konqueror = 3.93.0.svn712059 -Obsoletes: kdeaddons4-konqueror <= 3.93.0.svn712059 -Provides: kdeaddons4-renamedlgplugins = 3.93.0.svn712059 -Obsoletes: kdeaddons4-renamedlgplugins <= 3.93.0.svn712059 -Provides: kde4-kbackgammon = 3.95.1 -Obsoletes: kde4-kbackgammon <= 3.95.1 -Provides: kde4-kghostview = 3.95.1 -Obsoletes: kde4-kghostview <= 3.95.1 -Provides: kde4-noatun = 3.93.0.svn712059 -Obsoletes: kde4-noatun <= 3.93.0.svn712059 -Provides: kdeaccessibility4-kicker = 3.97.1 -Obsoletes: kdeaccessibility4-kicker <= 3.97.1 -Provides: kdetoys4-kicker = 3.97.1 -Obsoletes: kdetoys4-kicker <= 3.97.1 -Provides: kde4-khexeditor = 3.97.1 -Obsoletes: kde4-khexeditor <= 3.97.1 -Provides: kde4-kregexpeditor = 3.97.1 -Obsoletes: kde4-kregexpeditor <= 3.97.1 -Obsoletes: extragear-libs <= 4.0.80 -Obsoletes: kde4-kmilo <= 4.0.72 -Obsoletes: kde4-kmobiletools <= 4.0.80 -Obsoletes: kde4-knewsticker < 4.1.70 -Obsoletes: kde4-korn <= 4.1.0 -Obsoletes: kde4-kpercentage <= 4.0.73 -Obsoletes: kde4-kpilot <= 4.0.80 -Obsoletes: kde4-kworldclock <= 4.0.74 -Obsoletes: kde4-kxsldbg <= 4.0 -Obsoletes: kde4-quanta <= 4.0 -Obsoletes: kde4-secpolicy <= 4.0.80 -Obsoletes: kde4-kpercentage <= 4.1.87 -Obsoletes: kde4-ktnef <= 4.1.87 -Obsoletes: kde4-style-phase <= 4.1.87 -Obsoletes: kdeartwork4-kwin <= 4.1.87 -Obsoletes: kdeartwork4-kworldclock <= 4.1.87 -Obsoletes: libkscan4 <= 4.0.73 -Obsoletes: kpilot <= 4.3.80 -Obsoletes: kdeedu4 <= 4.6.80 -Obsoletes: kdeedu4-noarch <= 4.6.80 -Obsoletes: kmtrace-devel <= 4.6.80 -Obsoletes: kdeadmin4 <= 4.7.1 +Provides: kdeaddons4-kicker = 4.0 +Obsoletes: kdeaddons4-kicker < 4.0 +Provides: kde4-fsview = 4.0 +Obsoletes: kde4-fsview < 4.0 +Provides: kde4-kbackgammon = 4.0 +Obsoletes: kde4-kbackgammon < 4.0 +Provides: kde4-kghostview = 4.0 +Obsoletes: kde4-kghostview < 4.0 +Provides: kde4-khexeditor = 4.0 +Obsoletes: kde4-khexeditor < 4.0 +Provides: kde4-kregexpeditor = 4.0 +Obsoletes: kde4-kregexpeditor < 4.0 +Provides: kde4-kxsldbg = 4.0 +Obsoletes: kde4-kxsldbg < 4.0 +Provides: kde4-noatun = 4.0 +Obsoletes: kde4-noatun < 4.0 +Provides: kde4-quanta = 4.0 +Obsoletes: kde4-quanta < 4.0 +Provides: kdeaccessibility4-kicker = 4.0 +Obsoletes: kdeaccessibility4-kicker < 4.0 +Provides: kdeaddons4 = 4.0 +Obsoletes: kdeaddons4 < 4.0 +Provides: kdeaddons4-knewsticker = 4.0 +Obsoletes: kdeaddons4-knewsticker < 4.0 +Provides: kdeaddons4-konqueror = 4.0 +Obsoletes: kdeaddons4-konqueror < 4.0 +Provides: kdeaddons4-renamedlgplugins = 4.0 +Obsoletes: kdeaddons4-renamedlgplugins < 4.0 +Provides: kdetoys4-kicker = 4.0 +Obsoletes: kdetoys4-kicker < 4.0 +Provides: extragear-libs = 4.1 +Obsoletes: extragear-libs < 4.1 +Provides: kde4-kmilo = 4.1 +Obsoletes: kde4-kmilo < 4.1 +Provides: kde4-kmobiletools = 4.1 +Obsoletes: kde4-kmobiletools < 4.1 +Provides: kde4-korn = 4.1 +Obsoletes: kde4-korn < 4.1 +Provides: kde4-kpercentage = 4.1 +Obsoletes: kde4-kpercentage < 4.1 +Provides: kde4-kpilot = 4.1 +Obsoletes: kde4-kpilot < 4.1 +Provides: kde4-kworldclock = 4.1 +Obsoletes: kde4-kworldclock < 4.1 +Provides: kde4-secpolicy = 4.1 +Obsoletes: kde4-secpolicy < 4.1 +Provides: libkscan4 = 4.1 +Obsoletes: libkscan4 < 4.1 +Provides: kde4-knewsticker = 4.2 +Obsoletes: kde4-knewsticker < 4.2 +Provides: kde4-ktnef = 4.2 +Obsoletes: kde4-ktnef < 4.2 +Provides: kde4-style-phase = 4.2 +Obsoletes: kde4-style-phase < 4.2 +Provides: kdeartwork4-kwin = 4.2 +Obsoletes: kdeartwork4-kwin < 4.2 +Provides: kdeartwork4-kworldclock = 4.2 +Obsoletes: kdeartwork4-kworldclock < 4.2 +Provides: kpilot = 4.4 +Obsoletes: kpilot < 4.4 +Provides: kbattleship = 4.7 +Obsoletes: kbattleship < 4.7 +Provides: kdeadmin4 = 4.7 +Obsoletes: kdeadmin4 < 4.7 +Provides: kdeartwork4 = 4.7 +Obsoletes: kdeartwork4 < 4.7 +Provides: kdeedu4 = 4.7 +Obsoletes: kdeedu4 < 4.7 +Provides: kdeedu4-noarch = 4.7 +Obsoletes: kdeedu4-noarch < 4.7 +Provides: kdegames4 = 4.7 +Obsoletes: kdegames4 < 4.7 +Provides: kdemultimedia4 = 4.7 +Obsoletes: kdemultimedia4 < 4.7 +Provides: kdenetwork4 = 4.7 +Obsoletes: kdenetwork4 < 4.7 +Provides: kdesdk4 = 4.7 +Obsoletes: kdesdk4 < 4.7 +Provides: kdetoys4 = 4.7 +Obsoletes: kdetoys4 < 4.7 +Provides: kdeutils4 = 4.7 +Obsoletes: kdeutils4 < 4.7 +Provides: klines = 4.7 +Obsoletes: klines < 4.7 +Provides: kmtrace-devel = 4.7 +Obsoletes: kmtrace-devel < 4.7 +Provides: ktron = 4.7 +Obsoletes: ktron < 4.7 +Provides: ktuberling = 4.7 +Obsoletes: ktuberling < 4.7 # keep in sync with macros.kde4 # TODO: can we include macros.kde4 directly to define it? %define _kde_config_dir /usr/share/kde4/config @@ -83,61 +122,55 @@ %description This package installs the KDE directory structure. - - -Authors: --------- - The KDE Team <[email protected]> - %prep %build %install - install -D -m644 %{SOURCE0} $RPM_BUILD_ROOT/etc/rpm/macros.kde4 - install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT//usr/share/doc/packages/kde4-filesystem/COPYING - mkdir -p $RPM_BUILD_ROOT/%_kde_config_dir - mkdir -p $RPM_BUILD_ROOT/usr/share/applications/kde4 + install -D -m644 %{SOURCE0} %{buildroot}%{_sysconfdir}/rpm/macros.kde4 + install -D -m644 %{SOURCE1} %{buildroot}%{_docdir}/kde4-filesystem/COPYING + mkdir -p %{buildroot}/%{_kde_config_dir} + mkdir -p %{buildroot}%{_datadir}/applications/kde4 for size in scalable 128x128 64x64 48x48 32x32 22x22 16x16; do for type in actions apps devices filesystems mimetypes status; do for theme in crystalsvg oxygen hicolor locolor; do - mkdir -p $RPM_BUILD_ROOT/usr/share/icons/$theme/$size/$type + mkdir -p %{buildroot}%{_datadir}/icons/$theme/$size/$type done done done - mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/apps/small/16x16 - mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/apps/small/32x32 - mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/status/small/16x16 - mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/status/small/22x22 - mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/status/small/48x48 - 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 - mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/apps/color-schemes - mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/apps/khtml/kpartplugins - mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/apps/konqsidebartng/virtual_folders/services - mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/config.kcfg - mkdir -p $RPM_BUILD_ROOT/usr/include/KDE - for lang in `find /usr/share/locale/* -maxdepth 0 -type d -printf "%f\n"`; do mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/$lang; done + mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/small/16x16 + mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/small/32x32 + mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/status/small/16x16 + mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/status/small/22x22 + mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/status/small/48x48 + mkdir -p %{buildroot}%{_datadir}/kde4/services/phononbackends + mkdir -p %{buildroot}%{_datadir}/kde4/services/ServiceMenus + mkdir -p %{buildroot}%{_datadir}/kde4/apps + mkdir -p %{buildroot}%{_datadir}/kde4/apps/color-schemes + mkdir -p %{buildroot}%{_datadir}/kde4/apps/khtml/kpartplugins + mkdir -p %{buildroot}%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services + mkdir -p %{buildroot}%{_datadir}/kde4/config.kcfg + mkdir -p %{buildroot}%{_includedir}/KDE + mkdir -p %{buildroot}%{_libdir}/kde4 + mkdir -p %{buildroot}%{_libdir}/kde4/libexec + mkdir -p %{buildroot}%{_libdir}/kde4/plugins + for lang in `find /usr/share/locale/* -maxdepth 0 -type d -printf "%f\n"`; do mkdir -p %{buildroot}%{_datadir}/doc/kde/HTML/$lang; done %clean -rm -rf "$RPM_BUILD_ROOT" +rm -rf %{buildroot} %files %defattr(-,root,root) -%config /etc/rpm/macros.kde4 -%config %_kde_config_dir -%{_prefix}/share/kde4 -%dir /usr/share/doc/packages/kde4-filesystem -/usr/include/KDE -/usr/share/doc/kde -/usr/share/doc/packages/kde4-filesystem/COPYING -/usr/share/icons/* -/usr/share/applications/kde4 -/usr/share/kde4/services/phononbackends -%_libdir/kde4 +%config %{_sysconfdir}/rpm/macros.kde4 +%config %{_kde_config_dir} +%{_datadir}/kde4 +%{_datadir}/applications/kde4 +%{_datadir}/doc/kde +%{_datadir}/icons/* +%{_datadir}/kde4/services/phononbackends +%dir %{_docdir}/kde4-filesystem +%{_docdir}/kde4-filesystem/COPYING +%{_includedir}/KDE +%{_libdir}/kde4 %changelog ++++++ macros.kde4 ++++++ --- /var/tmp/diff_new_pack.SipyDl/_old 2011-10-18 14:16:52.000000000 +0200 +++ /var/tmp/diff_new_pack.SipyDl/_new 2011-10-18 14:16:52.000000000 +0200 @@ -1,40 +1,45 @@ -%_kde4_prefix %{_prefix} -%_kde4_bindir %{_bindir} -%_kde4_libdir %{_libdir} -%_kde4_modulesdir %{_libdir}/kde4 -%_kde4_libexecdir %{_libdir}/kde4/libexec +%_kde4_bindir %{_bindir} +%_kde4_datadir %{_datadir} +%_kde4_includedir %{_includedir} +%_kde4_libdir %{_libdir} +%_kde4_mandir %{_mandir} +%_kde4_prefix %{_prefix} +%_kde4_sbindir %{_sbindir} %_kde4_sysconfdir %{_sysconfdir} -%_kde4_iconsdir %{_kde4_prefix}/share/icons -%_kde4_sbindir %{_kde4_prefix}/sbin -%_kde4_applicationsdir %{_kde4_prefix}/share/applications/kde4 -%_kde4_mandir %{_kde4_prefix}/share/man -%_kde4_sharedir %{_kde4_prefix}/share/kde4 -%_kde4_appsdir %{_kde4_sharedir}/apps -%_kde4_configdir %{_kde4_sharedir}/config -%_kde4_configkcfgdir %{_kde4_sharedir}/config.kcfg -%_kde4_servicesdir %{_kde4_sharedir}/services + +%_kde4_applicationsdir %{_kde4_datadir}/applications/kde4 +%_kde4_iconsdir %{_kde4_datadir}/icons +%_kde4_wallpapersdir %{_kde4_datadir}/wallpapers + +%_kde4_sharedir %{_kde4_datadir}/kde4 +%_kde4_appsdir %{_kde4_sharedir}/apps +%_kde4_configdir %{_kde4_sharedir}/config +%_kde4_configkcfgdir %{_kde4_sharedir}/config.kcfg +%_kde4_servicesdir %{_kde4_sharedir}/services %_kde4_servicetypesdir %{_kde4_sharedir}/servicetypes -%_kde4_includedir %{_kde4_prefix}/include -%_kde4_docdir %{_kde4_prefix}/share/doc/kde -%_kde4_htmldir %{_kde4_prefix}/share/doc/kde/HTML -%_kde4_wallpapersdir %{_kde4_prefix}/share/wallpapers + +%_kde4_docdir %{_kde4_datadir}/doc/kde +%_kde4_htmldir %{_kde4_docdir}/HTML + +%_kde4_modulesdir %{_kde4_libdir}/kde4 +%_kde4_libexecdir %{_kde4_modulesdir}/libexec # these are for backwards compatibility -%_kde_prefix %{_kde4_prefix} -%_kde_libdir %{_kde4_libdir} -%_kde_share_dir %{_kde4_sharedir} -%_kde_config_dir %{_kde4_configdir} -%_kde_html_dir %{_kde4_htmldir} -%_kde4_modules %{_kde4_modulesdir} +%_kde_config_dir %{_kde4_configdir} +%_kde_html_dir %{_kde4_htmldir} +%_kde_libdir %{_kde4_libdir} +%_kde_prefix %{_kde4_prefix} +%_kde_share_dir %{_kde4_sharedir} +%_kde4_modules %{_kde4_modulesdir} %_kde4_servicetypes %{_kde4_servicetypesdir} %_kde_platform_version 4.7.2 -%_kde_pimlibs_version 4.7.2 -%_kde_akonadi_version 1.6.0 +%_kde_pimlibs_version 4.7.2 +%_kde_akonadi_version 1.6.0 %kde4_runtime_requires Requires: kdebase4-runtime >= %_kde_platform_version libqt4-x11 >= 4.7.3 -%kde4_pimlibs_requires Requires: kdepimlibs4 >= %_kde_pimlibs_version -%kde4_akonadi_requires Requires: akonadi-runtime >= %_kde_akonadi_version akonadi-runtime < 1.6.40 +%kde4_pimlibs_requires Requires: kdepimlibs4 >= %_kde_pimlibs_version +%kde4_akonadi_requires Requires: akonadi-runtime >= %_kde_akonadi_version akonadi-runtime < 1.6.40 %_kde_build_type release @@ -131,4 +136,3 @@ %make_jobs \ %{__make} %{?_smp_mflags} VERBOSE=1 - continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
