[packages/kde4-kdeadmin] - fixed -kprinter: -system-config-printer.patch & R: system-config-printer-libs - removed outdated -

Tue Dec 25 23:50:00 CET 2012

commit fa70644c32b6d7269cd03ac40a687674e18f2408
Author: Karol Krenski <charles at pld-linux.org>
Date:   Tue Dec 25 23:49:55 2012 +0100

    - fixed -kprinter: -system-config-printer.patch & R: system-config-printer-libs
    - removed outdated -liloconfig.patch & cleanups
    - updated BR's

 kde4-kdeadmin-liloconfig.patch            | 22 ---------
 kde4-kdeadmin-system-config-printer.patch | 12 +++++
 kde4-kdeadmin.spec                        | 75 ++++---------------------------
 3 files changed, 20 insertions(+), 89 deletions(-)
---

diff --git a/kde4-kdeadmin.spec b/kde4-kdeadmin.spec
index 0962740..d7cfb23 100644
--- a/kde4-kdeadmin.spec
+++ b/kde4-kdeadmin.spec
@@ -19,11 +19,13 @@ License:	GPL v2+
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
 # Source0-md5:	5b842d7e2be5dfb4f6e708a08c610e86
-Patch0:		%{name}-liloconfig.patch
+Patch0:		%{name}-system-config-printer.patch
 URL:		http://www.kde.org/
 BuildRequires:	automoc4 >= 0.9.88
 BuildRequires:	bzip2-devel
 BuildRequires:	cmake >= 2.8.0
+BuildRequires:	docbook-dtd42-xml
+BuildRequires:	docbook-style-xsl
 BuildRequires:	kde4-kdelibs-devel >= %{version}
 BuildRequires:	kde4-kdepimlibs-devel >= %{version}
 BuildRequires:	libpng-devel
@@ -36,7 +38,6 @@ BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.600
-BuildRequires:	system-config-printer
 Requires:	shadow
 Obsoletes:	%{name}-kcmlilo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,20 +62,6 @@ Aplikacje administratorskie dla KDE. Pakiet zawiera:
 - KUser - program do zarządzania kontami użytkowników,
 - lilo-config - moduł KControl do konfiguracji LILO (tylko x86).
 
-%package kcmlilo
-Summary:	LILO Configurator
-Summary(pl.UTF-8):	Konfigurator LILO
-Group:		X11/Applications
-Requires:	kde4-kdebase >= %{version}
-Requires:	lilo
-Obsoletes:	kdeadmin-kcmlinuz < 8:3.4.0
-
-%description kcmlilo
-LILO configuration module for KDE Control Centre.
-
-%description kcmlilo -l pl.UTF-8
-Konfigurator LILO dla Centrum Sterowania KDE.
-
 %package kcron
 Summary:	KDE Task Scheduler (cron GUI)
 Summary(pl.UTF-8):	Program do zlecania zadań dla KDE (graficzny interfejs do crona)
@@ -95,35 +82,13 @@ uruchamiania programów w systemach uniksowych.
 %description kcron -l pt_BR.UTF-8
 Gerenciador/agendador de tarefas e interface para o cron.
 
-%package kpackage
-Summary:	Package management front-end KDE
-Summary(pl.UTF-8):	Program do zarządzania pakietami
-Summary(pt_BR.UTF-8):	Interface para gerenciamento de pacotes RPM/DEB
-Group:		X11/Applications
-Requires:	kde4-kdebase >= %{version}
-Provides:	kpackage
-Obsoletes:	kpackage
-
-%description kpackage
-KPackage is a GUI interface to the RPM, Debian, Slackware and BSD
-package managers. KPackage is part of the K Desktop Environment and,
-as a result, it is designed to integrate with the KDE file manager.
-
-%description kpackage -l pl.UTF-8
-KPackage to graficzny interfejs do zarządców pakietów RPM, Debiana,
-Slackware'a i BSD. KPackage to część środowiska KDE, dzięki czemu
-integruje się z zarządcą plików KDE.
-
-%description kpackage -l pt_BR.UTF-8
-Interface para gerenciamento de pacotes RPM/DEB.
-
 %package kprinter
 Summary:	Printer configuration for KDE
 Summary(pl.UTF-8):	Konfigurator drukarek dla KDE
 Group:		X11/Applications
 Requires:	kde4-kdebase >= %{version}
 Requires:	poppler-progs
-Requires:	system-config-printer
+Requires:	system-config-printer-libs
 Requires:	python-PyKDE4-devel-tools
 
 %description kprinter
@@ -163,8 +128,7 @@ Ferramenta para administração de usuários do sistema.
 
 %prep
 %setup -q -n %{orgname}-%{version}
-# consider it obsolete?
-#%patch0 -p0
+%patch0 -p1
 
 %build
 install -d build
@@ -183,40 +147,18 @@ rm -rf $RPM_BUILD_ROOT
 	kde_htmldir=%{_kdedocdir}
 
 %find_lang kcron	--with-kde
-#%find_lang kdat		--with-kde
-#%find_lang kpackage	--with-kde
 %find_lang kuser	--with-kde
-%ifarch %{ix86} %{x8664}
-#%find_lang lilo-config	--with-kde
-%endif
+%find_lang system-config-printer-kde	--with-kde
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%ifarch %{ix86} %{x8664}
-#%files kcmlilo -f lilo-config.lang
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/kde4/kcm_lilo.so
-#%{_datadir}/kde4/services/lilo.desktop
-%endif
-
 %files kcron -f kcron.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kcm_cron.so
 %{_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
-
-%files kprinter
+
+%files kprinter -f system-config-printer-kde.lang
 %defattr(644,root,root,755)
 %dir %{_datadir}/apps/system-config-printer-kde
 %{_datadir}/apps/system-config-printer-kde/authconn.py
@@ -236,7 +178,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/apps/ksystemlog
 %{_desktopdir}/kde4/ksystemlog.desktop
 %{_datadir}/apps/ksystemlog/ksystemlogui.rc
-#%{_iconsdir}/hicolor/scalable/apps/ksystemlog.svgz
 %{_kdedocdir}/en/ksystemlog
 
 %files kuser -f kuser.lang
diff --git a/kde4-kdeadmin-liloconfig.patch b/kde4-kdeadmin-liloconfig.patch
deleted file mode 100644
index 903a7c8..0000000
--- a/kde4-kdeadmin-liloconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lilo-config/CMakeLists.txt	2008-01-29 10:18:52.000000000 +0100
-+++ lilo-config/CMakeLists.txt-new	2008-07-22 15:03:41.122766250 +0200
-@@ -2,7 +2,7 @@
- 
- add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
- 
--FIND_PROGRAM(LILO_EXECUTABLE NAMES lilo LILO  PATHS /sbin /usr/sbin /usr/local/sbin /opt/lilo  )
-+SET(LILO_EXECUTABLE /sbin/lilo)
- 
- if(LILO_EXECUTABLE)
- 	ADD_DEFINITIONS(-DUSE_KDE ) # added manually
---- doc/CMakeLists.txt	2008-02-13 16:45:55.000000000 +0100
-+++ doc/CMakeLists.txt.new	2008-07-23 12:14:30.300042000 +0200
-@@ -2,7 +2,7 @@
- #add_subdirectory(kdat)
- #add_subdirectory(ksysv)
- 
--FIND_PROGRAM(LILO_EXECUTABLE NAMES lilo LILO  PATHS /sbin /usr/sbin /usr/local/sbin /opt/lilo  )
-+SET(LILO_EXECUTABLE /sbin/lilo)
- 
- if ( UNIX )
-   add_subdirectory(kuser)
diff --git a/kde4-kdeadmin-system-config-printer.patch b/kde4-kdeadmin-system-config-printer.patch
new file mode 100644
index 0000000..cf4b95c
--- /dev/null
+++ b/kde4-kdeadmin-system-config-printer.patch
@@ -0,0 +1,12 @@
+--- kdeadmin-4.9.4/system-config-printer-kde/system-config-printer-kde.py.orig	2012-11-30 01:27:53.000000000 +0100
++++ kdeadmin-4.9.4/system-config-printer-kde/system-config-printer-kde.py	2012-12-25 22:59:48.067167781 +0100
+@@ -35,8 +35,7 @@
+ 
+ #load modules from system-config-printer-common (debug, smburi), change path here if you have it installed elsewhere
+ SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
+-if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/debug.py"):
+-    sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
++sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
+ 
+ from PyQt4.QtCore import *
+ from PyQt4.QtGui import *
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdeadmin.git/commitdiff/fa70644c32b6d7269cd03ac40a687674e18f2408

