SPECS (DEVEL): kde4-kdeadmin.spec - updated to 4.1.70 - added new subpackag...

[paszczus]

Author: paszczus                     Date: Sat Oct 18 19:30:19 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- updated to 4.1.70
- added new subpackage kprinter
- added Patch1: kde4-kdeadmin-printer.patch to find system-config-printer

---- Files affected:
SPECS:
   kde4-kdeadmin.spec (1.40.2.12 -> 1.40.2.13) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdeadmin.spec
diff -u SPECS/kde4-kdeadmin.spec:1.40.2.12 SPECS/kde4-kdeadmin.spec:1.40.2.13
--- SPECS/kde4-kdeadmin.spec:1.40.2.12	Fri Oct 10 13:26:03 2008
+++ SPECS/kde4-kdeadmin.spec	Sat Oct 18 21:30:13 2008
@@ -14,13 +14,14 @@
 Summary(pt_BR.UTF-8):	K Desktop Environment - ferramentas administrativas
 Summary(zh_CN.UTF-8):	KDE管理工具
 Name:		kde4-kdeadmin
-Version:	4.1.69
+Version:	4.1.70
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	4be35790726753fea6285239f5a8eaa3
+# Source0-md5:	dd2a78ead21f9a88b2ff1acbbe223639
 Patch0:		%{name}-liloconfig.patch
+Patch1:		%{name}-printer.patch
 URL:		http://www.kde.org/
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtCore-devel >= %{qtver}
@@ -118,6 +119,15 @@
 %description kpackage -l pt_BR.UTF-8
 Interface para gerenciamento de pacotes RPM/DEB.
 
+%package kprinter
+Summary:	Printer configuration for KDE4
+Group:		X11/Applications
+Requires:	kde4-kdebase-core >= %{version}
+Requires:	system-config-printer
+
+%description kprinter
+Printer configuration for KDE4
+
 %package ksystemlog
 Summary:	KDE4 system logger
 Group:		X11/Applications
@@ -173,6 +183,7 @@
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p0
+%patch1 -p1
 
 %build
 install -d build
@@ -180,6 +191,7 @@
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
+	-DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
@@ -230,6 +242,15 @@
 %{_datadir}/config.kcfg/kpackageSettings.kcfg
 %{_kdedocdir}/en/kcontrol
 
+%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
+
 %files ksystemlog
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ksystemlog
@@ -272,6 +293,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40.2.13  2008/10/18 19:30:13  paszczus
+- updated to 4.1.70
+- added new subpackage kprinter
+- added Patch1: kde4-kdeadmin-printer.patch to find system-config-printer
+
 Revision 1.40.2.12  2008/10/10 11:26:03  paszczus
 - updated to 4.1.69
 
================================================================

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