packages: kde4-kdeadmin/kde4-kdeadmin.spec - merged from DEVEL

shadzik shadzik at pld-linux.org
Thu Feb 18 01:40:59 CET 2010 

Author: shadzik                      Date: Thu Feb 18 00:40:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdeadmin:
   kde4-kdeadmin.spec (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: packages/kde4-kdeadmin/kde4-kdeadmin.spec
diff -u packages/kde4-kdeadmin/kde4-kdeadmin.spec:1.64 packages/kde4-kdeadmin/kde4-kdeadmin.spec:1.65
--- packages/kde4-kdeadmin/kde4-kdeadmin.spec:1.64	Thu Jan 28 22:59:43 2010
+++ packages/kde4-kdeadmin/kde4-kdeadmin.spec	Thu Feb 18 01:40:54 2010
@@ -3,34 +3,33 @@
 #   %{_pkgconfigdir}/system-tools-backends.pc
 %define		_state		stable
 %define		orgname		kdeadmin
-%define		qtver		4.5.3
+%define		qtver		4.6.1
 
 %include	/usr/lib/rpm/macros.perl
 
 Summary:	K Desktop Environment - administrative tools
 Summary(es.UTF-8):	K Desktop Environment - herramientas administrativas
-Summary(ko.UTF-8):	K 데스크탑 환경 - 관리 도구
+Summary(ko.UTF-8):	K 데스크탑 환경 - ê´„1¤7름1¤7도구
 Summary(pl.UTF-8):	K Desktop Environment - narzędzia administratora
 Summary(pt_BR.UTF-8):	K Desktop Environment - ferramentas administrativas
 Summary(zh_CN.UTF-8):	KDE管理工具
 Name:		kde4-kdeadmin
-Version:	4.3.5
+Version:	4.4.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	082537af4bd47ea9006ff4fd4e9bd7af
-#Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
+# Source0-md5:	a5fb36416b210e825db011c66a5695d3
 Patch0:		%{name}-liloconfig.patch
 URL:		http://www.kde.org/
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtCore-devel >= %{qtver}
 BuildRequires:	QtGui-devel >= %{qtver}
-BuildRequires:	QtSvg-devel
+BuildRequires:	QtSvg-devel >= %{qtver}
 BuildRequires:	QtTest-devel >= %{qtver}
 BuildRequires:	automoc4 >= 0.9.88
 BuildRequires:	bzip2-devel
-BuildRequires:	cmake >= 2.6.3
+BuildRequires:	cmake >= 2.8.0
 BuildRequires:	kde4-kdelibs-devel >= %{version}
 BuildRequires:	kde4-kdepimlibs-devel >= %{version}
 BuildRequires:	libjpeg-devel
@@ -39,7 +38,7 @@
 BuildRequires:	python-PyKDE4 >= %{version}
 BuildRequires:	python-PyQt4-devel
 BuildRequires:	python-pycups
-BuildRequires:	qt4-build
+BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpm-pythonprov
@@ -208,7 +207,7 @@
 
 %find_lang kcron	--with-kde
 #%find_lang kdat		--with-kde
-%find_lang kpackage	--with-kde
+#%find_lang kpackage	--with-kde
 %find_lang kuser	--with-kde
 #%find_lang knetworkconf --with-kde
 %ifarch %{ix86} %{x8664}
@@ -231,16 +230,15 @@
 %{_datadir}/kde4/services/kcm_cron.desktop
 #%{_kdedocdir}/en/kcron
 
-%files kpackage -f kpackage.lang
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/kpackage
-#%attr(755,root,root) %{_libdir}/kde4/kfile*.so
-%{_datadir}/apps/kpackage
-#%{_datadir}/services/kfile*
-%{_desktopdir}/kde4/kpackage.desktop
-%{_iconsdir}/*/*/*/kpackage.png
-%{_datadir}/config.kcfg/kpackageSettings.kcfg
-%{_kdedocdir}/en/kcontrol
+#%files kpackage -f kpackage.lang
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_bindir}/kpackage
+##%attr(755,root,root) %{_libdir}/kde4/kfile*.so
+#%{_datadir}/apps/kpackage
+##%{_datadir}/services/kfile*
+#%{_desktopdir}/kde4/kpackage.desktop
+#%{_iconsdir}/*/*/*/kpackage.png
+#%{_datadir}/config.kcfg/kpackageSettings.kcfg
 
 %files kprinter
 %defattr(644,root,root,755)
@@ -283,6 +281,7 @@
 %{_iconsdir}/*/*/actions/network_*.png
 # -devel?
 #%{_pkgconfigdir}/system-tools-backends.pc
+%{_kdedocdir}/en/kcontrol
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -290,31 +289,52 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.64  2010/01/28 21:59:43  shadzik
-- 4.3.5
+Revision 1.65  2010/02/18 00:40:54  shadzik
+- merged from DEVEL
 
-Revision 1.63  2009/12/03 20:44:11  sparky
-- BR: QtSvg-devel, qt4-build, rpm-pythonprov, system-config-printer
+Revision 1.56.2.14  2010/02/04 21:43:30  arekm
+- up to 4.4.0
 
-Revision 1.62  2009/11/28 18:54:29  shadzik
-- 4.3.4
+Revision 1.56.2.13  2010/02/02 20:53:32  shadzik
+- bump up qtver; it's not necessay but we make sure we link with the latest qtver
 
-Revision 1.61  2009/10/31 13:43:39  shadzik
-- 4.3.3
+Revision 1.56.2.12  2010/02/02 15:58:44  shadzik
+- minor clean up (removing old svn snap stuff)
 
-Revision 1.60  2009/10/03 11:58:19  shadzik
-- updated qt BR
+Revision 1.56.2.11  2010/02/02 15:34:26  shadzik
+- kprinter R: poppler-progs
 
-Revision 1.59  2009/10/03 08:54:06  shadzik
-- 4.3.2 try #1
-- remove priter.patch
-- BR: python-PyKDE4
+Revision 1.56.2.10  2010/02/02 13:10:10  shadzik
+- force cmake 2.8.0 BR
 
-Revision 1.58  2009/09/04 22:24:33  shadzik
-- kprinter R: poppler-progs
+Revision 1.56.2.9  2010/02/01 00:34:58  shadzik
+- 4.4 RC3
+
+Revision 1.56.2.8  2010/01/17 21:01:16  arekm
+- up to 4.3.90
+
+Revision 1.56.2.7  2009/12/21 01:00:38  shadzik
+- 4.4 Beta2
+- corrected my BR fuckup :)
+
+Revision 1.56.2.6  2009/12/05 02:09:32  shadzik
+- 4.4 beta1
+- more BRs
+
+Revision 1.56.2.5  2009/10/29 12:47:53  paszczus
+- updated to 4.3.73
+
+Revision 1.56.2.4  2009/10/18 18:05:10  paszczus
+- updated to 4.3.72
+
+Revision 1.56.2.3  2009/10/07 17:45:41  cactus
+- up to 4.3.69
+
+Revision 1.56.2.2  2009/09/12 11:02:07  cactus
+- up to 4.3.67
 
-Revision 1.57  2009/08/28 15:22:58  shadzik
-- 4.3.1
+Revision 1.56.2.1  2009/08/24 09:18:14  cactus
+- up to 4.3.65
 
 Revision 1.56  2009/08/03 15:20:21  arekm
 - values are case sensitive it seems
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeadmin/kde4-kdeadmin.spec?r1=1.64&r2=1.65&f=u

More information about the pld-cvs-commit mailing list