Mailinglist Archive: opensuse-commit (1003 mails)
| < Previous | Next > |
commit kdelibs4
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 01 Jun 2007 11:21:39 +0200
- Message-id: <20070601092140.1A642678168@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kdelibs4
checked in at Fri Jun 1 11:21:39 CEST 2007.
--------
--- KDE/kdelibs4/kdelibs4.changes 2007-05-28 19:10:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2007-06-01 10:55:21.000000000 +0200
@@ -1,0 +2,20 @@
+Fri Jun 1 10:55:12 CEST 2007 - coolo@xxxxxxx
+
+- update to 3.90.1.svn670163
+
+-------------------------------------------------------------------
+Fri Jun 1 10:53:30 CEST 2007 - coolo@xxxxxxx
+
+- use kde4-filesystem's macros for easier spec file
+
+-------------------------------------------------------------------
+Wed May 30 14:29:45 CEST 2007 - coolo@xxxxxxx
+
+- let other packages follow kdelibs's guidance on installation paths
+
+-------------------------------------------------------------------
+Tue May 29 14:14:35 CEST 2007 - coolo@xxxxxxx
+
+- fix installation paths
+
+-------------------------------------------------------------------
kdelibs4-icons.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4-icons.spec ++++++
--- /var/tmp/diff_new_pack.Hz2423/_old 2007-06-01 11:20:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Hz2423/_new 2007-06-01 11:20:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdelibs4-icons (Version 3.90.1.svn668118)
+# spec file for package kdelibs4-icons (Version 3.90.1.svn670163)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,7 +18,7 @@
Group: System/GUI/KDE
Summary: Icons of KDE Libraries
URL: http://www.kde.org
-Version: 3.90.1.svn668118
+Version: 3.90.1.svn670163
Release: 1
Requires: hicolor-icon-theme
Recommends: kdelibs4-icons-scalable
@@ -49,7 +49,9 @@
cd build/pics/oxygen
make install DESTDIR="$RPM_BUILD_ROOT"
mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/filesystems
+%if %suse_version > 1020
%fdupes $RPM_BUILD_ROOT
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -85,6 +87,14 @@
/usr/share/icons/oxygen
%changelog
+* Fri Jun 01 2007 - coolo@xxxxxxx
+- update to 3.90.1.svn670163
+* Fri Jun 01 2007 - coolo@xxxxxxx
+- use kde4-filesystem's macros for easier spec file
+* Wed May 30 2007 - coolo@xxxxxxx
+- let other packages follow kdelibs's guidance on installation paths
+* Tue May 29 2007 - coolo@xxxxxxx
+- fix installation paths
* Mon May 28 2007 - dmueller@xxxxxxx
- update to 3.90.1.svn668118
* Tue May 15 2007 - stbinner@xxxxxxx
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.Hz2423/_old 2007-06-01 11:20:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Hz2423/_new 2007-06-01 11:20:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdelibs4 (Version 3.90.1.svn668118)
+# spec file for package kdelibs4 (Version 3.90.1.svn670163)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,18 +13,18 @@
BuildRequires: alsa-devel aspell-devel cmake cups-devel giflib-devel hicolor-icon-theme
BuildRequires: libattr-devel libpng-devel libqt4-devel libtiff-devel libxslt-devel unzip
BuildRequires: libsoprano-devel mDNSResponder-devel pcre-devel shared-mime-info strigi-devel
+BuildRequires: kde4-filesystem
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/GUI/KDE
Summary: KDE Base Libraries
URL: http://www.kde.org
-Version: 3.90.1.svn668118
+Version: 3.90.1.svn670163
Release: 1
Requires: libqt4-x11 > 4.2
-Requires: libkde4 kdelibs4-core kdelibs4-icons dbus-1-x11 shared-mime-info
+Requires: kdelibs4-core kdelibs4-icons dbus-1-x11 shared-mime-info
Source0: kdelibs.tar.bz2
Patch0: dotkde4.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%define prefix /usr
%description
This package contains the basic packages of the K Desktop Environment.
@@ -48,64 +48,25 @@
export CXXFLAGS="$CFLAGS"
mkdir build
cd build
- cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=release \
- -DLIB_INSTALL_DIR=%{_libdir} -DLIB_SUFFIX=$(echo %_lib | cut -b -f3-) ..
- make %{?jobs:-j %jobs}
+ cmake -DCMAKE_INSTALL_PREFIX=%{_kde_prefix} -DCMAKE_BUILD_TYPE=%{_kde_build_type} \
+ -DLIB_INSTALL_DIR=%{_kde_libdir} \
+ -DCONFIG_INSTALL_DIR=%{_kde_config_dir} \
+ -DDATA_INSTALL_DIR=%{_kde_share_dir}/apps \
+ -DKCFG_INSTALL_DIR=%{_kde_share_dir}/config.kcfg \
+ -DMIME_INSTALL_DIR=/nogo \
+ -DTEMPLATES_INSTALL_DIR=%{_kde_share_dir}/templates \
+ -DLIB_SUFFIX=$(echo %_lib | cut -b -f3-) ..
+ %make_jobs
%install
cd build
- make install \
- DESTDIR="$RPM_BUILD_ROOT"
+ %makeinstall
rm -rf $RPM_BUILD_ROOT/usr/share/icons/hicolor/index.theme
rm -rf $RPM_BUILD_ROOT/usr/share/icons/oxygen
mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged
mv $RPM_BUILD_ROOT/usr/etc/xdg/menus/applications.menu \
$RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde4
- mkdir -p $RPM_BUILD_ROOT/usr/share/applications/kde4
- mkdir -p $RPM_BUILD_ROOT/usr/share/config.kcfg
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/128x128/actions
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/128x128/apps
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/128x128/devices
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/128x128/filesystems
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/128x128/mimetypes
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/16x16/actions
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/16x16/apps
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/16x16/devices
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/16x16/filesystems
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/16x16/mimetypes
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/22x22/actions
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/22x22/apps
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/22x22/devices
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/22x22/filesystems
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/22x22/places
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/22x22/mimetypes
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/32x32/actions
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/32x32/apps
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/32x32/devices
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/32x32/filesystems
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/32x32/mimetypes
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/32x32/places
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/48x48/actions
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/48x48/apps
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/48x48/devices
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/48x48/filesystems
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/48x48/mimetypes
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/64x64/actions
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/64x64/apps
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/64x64/devices
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/64x64/filesystems
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/64x64/mimetypes
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/scalable/actions
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/scalable/apps
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/scalable/devices
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/scalable/filesystems
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/scalable/mimetypes
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/locolor/16x16/actions
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/locolor/16x16/apps
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/locolor/22x22/actions
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/locolor/22x22/apps
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/locolor/32x32/actions
- mkdir -p $RPM_BUILD_ROOT/usr/share/icons/locolor/32x32/apps
+ %kde_post_install
%post -p /sbin/ldconfig
@@ -135,7 +96,8 @@
%files doc
%defattr(-,root,root)
/usr/bin/meinproc4
-/usr/share/apps/ksgmltools2
+
+%_kde_share_dir/apps/ksgmltools2
%package -n libkdecore4
Group: System/GUI/KDE
Summary: KDE Core Libraries
@@ -166,7 +128,7 @@
%package -n kdelibs4-core
Group: System/GUI/KDE
Summary: KDE Base Libraries
-Requires: libkdecore4
+Requires: libkdecore4 kde4-filesystem
%description -n kdelibs4-core
This package contains the basic packages of the K Desktop Environment.
@@ -188,17 +150,20 @@
/usr/bin/kde4-config
/usr/%_lib/kde4/ktranscript.so
/usr/%_lib/kde4/libexec/kgrantpty
-/usr/share/config/kdebug.areas
-/usr/share/config/kdebugrc
-/usr/share/config/language.codes
-%dir /usr/share/kde4
-/usr/share/kde4/servicetypes/kplugininfo.desktop
-/usr/share/kde4/servicetypes/sonnetspeller.desktop
+%config %_kde_config_dir/kdebug.areas
+%config %_kde_config_dir/kdebugrc
+%config %_kde_config_dir/language.codes
+%dir %_kde_share_dir
+
+%_kde_share_dir/servicetypes/kplugininfo.desktop
+
+%_kde_share_dir/servicetypes/sonnetspeller.desktop
/usr/share/locale/all_languages
%package -n libkdecore4-devel
Group: System/GUI/KDE
Summary: KDE Core Libraries: Build Environment
-Requires: libkdecore4 kdelibs4-core
+Requires: libkdecore4 = %{version}
+Requires: kdelibs4-core
%description -n libkdecore4-devel
This package contains all necessary include files and libraries needed
@@ -504,7 +469,8 @@
%exclude /usr/include/sonnet/settings.h
%exclude /usr/include/sonnet/speller.h
/usr/include/*
-/usr/share/apps/cmake
+
+%_kde_share_dir/apps/cmake
/usr/%_lib/libkmetadata.so
/usr/%_lib/libknepomuk.so
/usr/%_lib/libkonto.so
@@ -544,16 +510,16 @@
%files
%defattr(-,root,root)
%exclude /usr/bin/meinproc4
-%exclude /usr/share/apps/ksgmltools2
-%exclude /usr/share/apps/cmake
+%exclude %_kde_share_dir/apps/ksgmltools2
+%exclude %_kde_share_dir/apps/cmake
%exclude /usr/bin/kde4-config
%exclude /usr/%_lib/kde4/ktranscript.so
%exclude /usr/%_lib/kde4/libexec/kgrantpty
-%exclude /usr/share/config/kdebug.areas
-%exclude /usr/share/config/kdebugrc
-%exclude /usr/share/config/language.codes
-%exclude /usr/share/kde4/servicetypes/kplugininfo.desktop
-%exclude /usr/share/kde4/servicetypes/sonnetspeller.desktop
+%exclude %_kde_config_dir/kdebug.areas
+%exclude %_kde_config_dir/kdebugrc
+%exclude %_kde_config_dir/language.codes
+%exclude %_kde_share_dir/servicetypes/kplugininfo.desktop
+%exclude %_kde_share_dir/servicetypes/sonnetspeller.desktop
%exclude /usr/share/locale/all_languages
%exclude /usr/bin/kconfig_compiler
/usr/bin/*
@@ -565,23 +531,31 @@
/usr/%_lib/libkdeinit4_kio_http_cache_cleaner.so
/usr/%_lib/libkdeinit4_klauncher.so
/usr/%_lib/libkdeinit4_kbuildsycoca4.so
-/usr/share/apps
-/usr/share/config
+
+%_kde_share_dir/apps/*
+%config %_kde_config_dir/*
/usr/share/dbus-1
/usr/share/doc/*
/usr/share/emoticons
/usr/share/icons/crystalsvg
/usr/share/icons/hicolor
-/usr/share/icons/locolor
/usr/share/locale/*
-/usr/share/applications/kde4
-/usr/share/config.kcfg
-/usr/share/kde4/services
-/usr/share/kde4/servicetypes
+
+%_kde_share_dir/services
+
+%_kde_share_dir/servicetypes
/etc/xdg/menus
/usr/share/mime/packages/kde.xml
%changelog
+* Fri Jun 01 2007 - coolo@xxxxxxx
+- update to 3.90.1.svn670163
+* Fri Jun 01 2007 - coolo@xxxxxxx
+- use kde4-filesystem's macros for easier spec file
+* Wed May 30 2007 - coolo@xxxxxxx
+- let other packages follow kdelibs's guidance on installation paths
+* Tue May 29 2007 - coolo@xxxxxxx
+- fix installation paths
* Mon May 28 2007 - dmueller@xxxxxxx
- update to 3.90.1.svn668118
* Tue May 15 2007 - stbinner@xxxxxxx
++++++ dotkde4.diff ++++++
--- /var/tmp/diff_new_pack.Hz2423/_old 2007-06-01 11:20:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Hz2423/_new 2007-06-01 11:20:37.000000000 +0200
@@ -1,13 +1,13 @@
Index: kdecore/kernel/kstandarddirs.cpp
===================================================================
---- kdecore/kernel/kstandarddirs.cpp (revision 645263)
-+++ kdecore/kernel/kstandarddirs.cpp (working copy)
-@@ -1484,7 +1484,7 @@
+--- kdecore/kernel/kstandarddirs.cpp (Revision 670115)
++++ kdecore/kernel/kstandarddirs.cpp (Arbeitskopie)
+@@ -1578,7 +1578,7 @@
#ifdef Q_WS_MACX
- localKdeDir = QDir::homePath() + "/Library/Preferences/KDE/";
+ localKdeDir = QDir::homePath() + "/Library/Preferences/KDE/";
#else
-- localKdeDir = QDir::homePath() + "/.kde/";
-+ localKdeDir = QDir::homePath() + "/.kde4/";
+- localKdeDir = QDir::homePath() + "/.kde/";
++ localKdeDir = QDir::homePath() + "/.kde4/";
#endif
}
++++++ kdelibs.tar.bz2 ++++++
KDE/kdelibs4/kdelibs.tar.bz2 /mounts/work_src_done/STABLE/kdelibs4/kdelibs.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |