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

[shadzik]

Author: shadzik                      Date: Wed Jul 29 20:15:07 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdeadmin:
   kde4-kdeadmin.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: packages/kde4-kdeadmin/kde4-kdeadmin.spec
diff -u packages/kde4-kdeadmin/kde4-kdeadmin.spec:1.53 packages/kde4-kdeadmin/kde4-kdeadmin.spec:1.54
--- packages/kde4-kdeadmin/kde4-kdeadmin.spec:1.53	Fri May 29 00:31:59 2009
+++ packages/kde4-kdeadmin/kde4-kdeadmin.spec	Wed Jul 29 22:15:02 2009
@@ -3,7 +3,7 @@
 #   %{_pkgconfigdir}/system-tools-backends.pc
 %define		_state		stable
 %define		orgname		kdeadmin
-%define		qtver		4.5.1
+%define		qtver		4.5.2
 
 %include	/usr/lib/rpm/macros.perl
 
@@ -14,12 +14,13 @@
 Summary(pt_BR.UTF-8):	K Desktop Environment - ferramentas administrativas
 Summary(zh_CN.UTF-8):	KDE管理工具
 Name:		kde4-kdeadmin
-Version:	4.2.4
+Version:	4.3.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:	d88c5a3819924f7f49f50365811a67c7
+# Source0-md5:	8f2001ce27d9f9700fbd75e0c691f1f2
+#Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
 Patch0:		%{name}-liloconfig.patch
 Patch1:		%{name}-printer.patch
 URL:		http://www.kde.org/
@@ -36,6 +37,7 @@
 BuildRequires:	libpng-devel
 BuildRequires:	pam-devel
 BuildRequires:	python-PyQt4-devel
+BuildRequires:	python-pycups
 BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.213
@@ -183,6 +185,7 @@
 cd build
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DLIB_INSTALL_DIR=%{_libdir} \
 	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
 	-DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE \
 	-DCMAKE_BUILD_TYPE=%{!?debug:release}%{?debug:debug} \
@@ -237,12 +240,15 @@
 
 %files kprinter
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/system-config-printer-kde
-%{_desktopdir}/kde4/system-config-printer-kde.desktop
 %dir %{_datadir}/apps/system-config-printer-kde
 %{_datadir}/apps/system-config-printer-kde/new-printer.ui
 %{_datadir}/apps/system-config-printer-kde/system-config-printer-kde.py
 %{_datadir}/apps/system-config-printer-kde/system-config-printer.ui
+%{_datadir}/apps/system-config-printer-kde/ipp-browse-dialog.ui
+%{_datadir}/apps/system-config-printer-kde/options.py
+%{_datadir}/apps/system-config-printer-kde/optionwidgets.py
+%{_datadir}/apps/system-config-printer-kde/smb-browse-dialog.ui
+%{_datadir}/kde4/services/system-config-printer-kde.desktop
 
 %files ksystemlog
 %defattr(644,root,root,755)
@@ -250,7 +256,6 @@
 %dir %{_datadir}/apps/ksystemlog
 %{_desktopdir}/kde4/ksystemlog.desktop
 %{_datadir}/apps/ksystemlog/ksystemlogui.rc
-%{_iconsdir}/hicolor/*/apps/ksystemlog.png
 #%{_iconsdir}/hicolor/scalable/apps/ksystemlog.svgz
 %{_kdedocdir}/en/ksystemlog
 
@@ -281,8 +286,34 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.53  2009/05/28 22:31:59  shadzik
-- 4.2.4 try #1
+Revision 1.54  2009/07/29 20:15:02  shadzik
+- merged from DEVEL
+
+Revision 1.52.2.8  2009/07/29 20:14:42  shadzik
+- 4.3.0
+
+Revision 1.52.2.7  2009/07/22 11:34:06  shadzik
+- 4.3rc3
+
+Revision 1.52.2.6  2009/07/09 19:03:58  paszczus
+- updated to 4.2.96
+
+Revision 1.52.2.5  2009/07/04 15:32:42  shadzik
+- fix --target build
+
+Revision 1.52.2.4  2009/06/29 20:10:36  shadzik
+- 4.3 RC1
+
+Revision 1.52.2.3  2009/06/11 13:01:43  paszczus
+- updated to 4.2.91
+- added BR: python-pycups
+
+Revision 1.52.2.2  2009/05/30 14:57:00  paszczus
+- updated to 4.2.88
+
+Revision 1.52.2.1  2009/05/27 11:47:08  paszczus
+- updated to 4.2.87
+- updated -printer.patch
 
 Revision 1.52  2009/05/08 15:02:01  shadzik
 - release 3
================================================================

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