Hello community,
here is the log from the commit of package kdeadmin4
checked in at Sun Jun 3 21:28:25 CEST 2007.
--------
--- KDE/kdeadmin4/kdeadmin4.changes 2007-05-28 23:12:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeadmin4/kdeadmin4.changes 2007-06-01 13:36:32.422161000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 1 13:31:58 CEST 2007 - coolo@suse.de
+
+- simplify spec file by using macros from kde4-filesystem
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeadmin4.spec ++++++
--- /var/tmp/diff_new_pack.Y28627/_old 2007-06-03 21:28:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Y28627/_new 2007-06-03 21:28:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdeadmin4 (Version 3.90.1.svn668119)
+# spec file for package kdeadmin4 (Version 3.90.1.svn670093)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,7 +15,7 @@
Group: System/GUI/KDE
Summary: kdeadmin base package
URL: http://www.kde.org
-Version: 3.90.1.svn668119
+Version: 3.90.1.svn670093
Release: 1
Source0: kdeadmin.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -25,7 +25,6 @@
Suggests: kde4-kuser
Suggests: kde4-secpolicy
Suggests: kde4-knetworkconf
-%define prefix /usr
%description
This package suggests the packages which are built from the kdeadmin
@@ -41,24 +40,16 @@
%setup -q -n kdeadmin
%build
- export CFLAGS="$RPM_OPT_FLAGS"
- export CXXFLAGS="$CFLAGS"
- mkdir build
- cd build
- %ifarch x86_64 ppc64 s390x mips64 sparc64
- cmake -DCMAKE_INSTALL_PREFIX=%prefix -DCMAKE_BUILD_TYPE=debugfull ../ -DLIB_INSTALL_DIR=%prefix/lib64
- %else
- cmake -DCMAKE_INSTALL_PREFIX=%prefix -DCMAKE_BUILD_TYPE=debugfull ../
- %endif
- make
+ %cmake_kde4 -d build
+ %make_jobs
%install
cd build
- make install \
- DESTDIR="$RPM_BUILD_ROOT"
+ %makeinstall
%suse_update_desktop_file kpackage System PackageManager
%suse_update_desktop_file kcron System ServiceConfiguration
%suse_update_desktop_file kuser System SystemSetup
+ %kde_post_install
%post -p /sbin/ldconfig
@@ -92,7 +83,8 @@
%doc COPYING COPYING-DOCS README
/usr/bin/kcron
/usr/share/applications/kde4/kcron.desktop
-/usr/share/apps/kcron
+
+%_kde_share_dir/apps/kcron
%doc %lang(en) /usr/share/doc/HTML/en/kcron
/usr/share/icons/hicolor/*/apps/kcron.*
%package -n kde4-kpackage
@@ -121,7 +113,8 @@
%doc COPYING COPYING-DOCS README
/usr/bin/kpackage
/usr/share/applications/kde4/kpackage.desktop
-/usr/share/apps/kpackage
+
+%_kde_share_dir/apps/kpackage
%doc %lang(en) /usr/share/doc/HTML/en/kpackage
/usr/share/icons/hicolor/*/apps/kpackage.*
%package -n kde4-kuser
@@ -150,8 +143,10 @@
%doc COPYING COPYING-DOCS README
/usr/bin/kuser
/usr/share/applications/kde4/kuser.desktop
-/usr/share/apps/kuser
-/usr/share/config.kcfg/kuser.kcfg
+
+%_kde_share_dir/apps/kuser
+
+%_kde_share_dir/config.kcfg/kuser.kcfg
%doc %lang(en) /usr/share/doc/HTML/en/kuser
/usr/share/icons/hicolor/*/apps/kuser.*
%package -n kde4-secpolicy
@@ -205,14 +200,16 @@
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
/usr/%_lib/kde4/kcm_knetworkconfmodule.so
-/usr/share/apps/knetworkconf
+
+%_kde_share_dir/apps/knetworkconf
%doc %lang(en) /usr/share/doc/HTML/en/knetworkconf
/usr/share/icons/hicolor/*/apps/knetworkconf.*
/usr/share/icons/hicolor/*/actions/network_connected_lan_knc.*
/usr/share/icons/hicolor/*/actions/network_disconnected_lan.*
/usr/share/icons/hicolor/*/actions/network_disconnected_wlan.*
/usr/share/icons/hicolor/*/actions/network_traffic_wlan.*
-/usr/share/kde4/services/kcm_knetworkconfmodule.desktop
+
+%_kde_share_dir/services/kcm_knetworkconfmodule.desktop
/usr/%_lib/pkgconfig/system-tools-backends.pc
%files
@@ -220,6 +217,8 @@
%doc COPYING COPYING-DOCS README
%changelog
+* Fri Jun 01 2007 - coolo@suse.de
+- simplify spec file by using macros from kde4-filesystem
* Mon May 28 2007 - dmueller@suse.de
- update to 3.90.1.svn668119
* Fri May 18 2007 - stbinner@suse.de
++++++ kdeadmin.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin/kcron/kcron.desktop new/kdeadmin/kcron/kcron.desktop
--- old/kdeadmin/kcron/kcron.desktop 2007-05-21 07:11:29.000000000 +0200
+++ new/kdeadmin/kcron/kcron.desktop 2007-05-29 07:16:56.000000000 +0200
@@ -60,7 +60,7 @@
GenericName[se]=Bargoplánejeaddji
GenericName[sl]=Razporejevalnik opravil
GenericName[sr]=Организатор задатака
-GenericName[sr@Latn]=Organizator zadataka
+GenericName[sr@latin]=Organizator zadataka
GenericName[sv]=Jobbschemaläggare
GenericName[ta]=பணி அமைப்பான்
GenericName[tg]=Нақшаи Масъала
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin/kdat/kdat.desktop new/kdeadmin/kdat/kdat.desktop
--- old/kdeadmin/kdat/kdat.desktop 2007-05-21 07:11:29.000000000 +0200
+++ new/kdeadmin/kdat/kdat.desktop 2007-05-29 07:16:56.000000000 +0200
@@ -56,7 +56,7 @@
GenericName[se]=Liigemáŋgen báddái
GenericName[sl]=Orodje za tračne rezervne kopije
GenericName[sr]=Алат за архивирање на траку
-GenericName[sr@Latn]=Alat za arhiviranje na traku
+GenericName[sr@latin]=Alat za arhiviranje na traku
GenericName[sv]=Verktyg för bandsäkerhetskopiering
GenericName[ta]=நாடா காப்பக கருவி
GenericName[tg]=Утилита барои архив кардан ба тасма
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin/kfile-plugins/rpm/kfile_rpm.desktop new/kdeadmin/kfile-plugins/rpm/kfile_rpm.desktop
--- old/kdeadmin/kfile-plugins/rpm/kfile_rpm.desktop 2007-05-03 07:04:02.000000000 +0200
+++ new/kdeadmin/kfile-plugins/rpm/kfile_rpm.desktop 2007-05-29 07:16:56.000000000 +0200
@@ -41,7 +41,7 @@
Name[se]=RPM-statistihkka
Name[sl]=Statistike RPM
Name[sr]=RPM Статистике
-Name[sr@Latn]=RPM Statistike
+Name[sr@latin]=RPM Statistike
Name[sv]=RPM-statistik
Name[ta]=RPM புள்ளி விவரம்
Name[tg]=Статистикаи RPM
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop new/kdeadmin/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop
--- old/kdeadmin/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop 2007-05-21 07:11:29.000000000 +0200
+++ new/kdeadmin/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop 2007-05-29 07:16:56.000000000 +0200
@@ -55,7 +55,7 @@
Comment[se]=Heivet fierpmádaga
Comment[sl]=Nastavite omrežne nastavitve
Comment[sr]=Подешавање поставки мреже
-Comment[sr@Latn]=Podešavanje postavki mreže
+Comment[sr@latin]=Podešavanje postavki mreže
Comment[sv]=Anpassa nätverksinställningar
Comment[th]=ตั้งค่าการปรับแต่งเครือข่าย
Comment[uk]=Налаштувати мережні параметри
@@ -102,7 +102,7 @@
Name[se]=Fierpmádatheivehusat
Name[sl]=Omrežne nastavitve
Name[sr]=Поставке мреже
-Name[sr@Latn]=Postavke mreže
+Name[sr@latin]=Postavke mreže
Name[sv]=Nätverksinställningar
Name[th]=ตั้งค่าเครือข่าย
Name[uk]=Мережні параметри
@@ -144,7 +144,7 @@
Keywords[se]=Fierpmádat,DNS,routes,lavttat
Keywords[sl]=Network,DNS,routes,interfaces,omrežje,vmesniki,poti,usmerjanje
Keywords[sr]=Мрежа,DNS,руте,интерфејси
-Keywords[sr@Latn]=Mreža,DNS,rute,interfejsi
+Keywords[sr@latin]=Mreža,DNS,rute,interfejsi
Keywords[sv]=Nätverk,DNS,route,gränssnitt
Keywords[th]=เครือข่าย,DNS,routes,interfaces
Keywords[uk]=Network,DNS,routes,interfaces,мережа,інтерфейси
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin/knetworkconf/knetworkconf/knetworkconf.desktop new/kdeadmin/knetworkconf/knetworkconf/knetworkconf.desktop
--- old/kdeadmin/knetworkconf/knetworkconf/knetworkconf.desktop 2007-05-21 07:11:29.000000000 +0200
+++ new/kdeadmin/knetworkconf/knetworkconf/knetworkconf.desktop 2007-05-29 07:16:56.000000000 +0200
@@ -44,7 +44,7 @@
Comment[se]=Heivet TCP/IP:a
Comment[sl]=Nastavite TCP/IP nastavitve
Comment[sr]=Подесите TCP/IP поставке
-Comment[sr@Latn]=Podesite TCP/IP postavke
+Comment[sr@latin]=Podesite TCP/IP postavke
Comment[sv]=Anpassa TCP/IP-inställningar
Comment[th]=ปรับแต่งการตั้งค่า TCP/IP
Comment[uk]=Налаштувати параметри TCP/IP
@@ -98,7 +98,7 @@
GenericName[se]=Heivet TCP/IP:a
GenericName[sl]=Nastavite TCP/IP nastavitve
GenericName[sr]=Подеси TCP/IP поставке
-GenericName[sr@Latn]=Podesi TCP/IP postavke
+GenericName[sr@latin]=Podesi TCP/IP postavke
GenericName[sv]=Anpassa TCP/IP-inställningar
GenericName[th]=ปรับแต่งการตั้งค่า TCP/IP
GenericName[uk]=Налаштувати параметри TCP/IP
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin/kpackage/kpackage.desktop new/kdeadmin/kpackage/kpackage.desktop
--- old/kdeadmin/kpackage/kpackage.desktop 2007-05-21 07:11:29.000000000 +0200
+++ new/kdeadmin/kpackage/kpackage.desktop 2007-05-29 07:16:56.000000000 +0200
@@ -59,7 +59,7 @@
GenericName[se]=Páhkkagieđahalli
GenericName[sl]=Upravljalnik paketov
GenericName[sr]=Менаџер пакета
-GenericName[sr@Latn]=Menadžer paketa
+GenericName[sr@latin]=Menadžer paketa
GenericName[sv]=Pakethanterare
GenericName[ta]=தொகுப்பு மேலாளர்
GenericName[tg]=Роҳбари Package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin/kpackage/pkgOptions.cpp new/kdeadmin/kpackage/pkgOptions.cpp
--- old/kdeadmin/kpackage/pkgOptions.cpp 2007-05-14 15:56:34.000000000 +0200
+++ new/kdeadmin/kpackage/pkgOptions.cpp 2007-05-29 17:39:01.000000000 +0200
@@ -163,7 +163,7 @@
return setup(pl);
}
-bool pkgOptions::resetPackages()
+void pkgOptions::resetPackages()
{
kDebug() << "resetPackages()\n";
QApplication::setOverrideCursor( Qt::WaitCursor );
@@ -213,7 +213,6 @@
installButton->setEnabled(true);
QApplication::restoreOverrideCursor();
-
}
bool pkgOptions::setup(QList