SPECS: kde4-kdeadmin.spec - merged from DEVEL - 4.2.0 stable - rel 3
shadzik
shadzik at pld-linux.org
Tue Feb 3 16:56:43 CET 2009
Author: shadzik Date: Tue Feb 3 15:56:43 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged from DEVEL
- 4.2.0 stable
- rel 3
---- Files affected:
SPECS:
kde4-kdeadmin.spec (1.42 -> 1.43)
---- Diffs:
================================================================
Index: SPECS/kde4-kdeadmin.spec
diff -u SPECS/kde4-kdeadmin.spec:1.42 SPECS/kde4-kdeadmin.spec:1.43
--- SPECS/kde4-kdeadmin.spec:1.42 Wed Aug 13 12:39:44 2008
+++ SPECS/kde4-kdeadmin.spec Tue Feb 3 16:56:38 2009
@@ -1,10 +1,9 @@
# $Revision$, $Date$
# TODO
-# - unpackaged files
# %{_pkgconfigdir}/system-tools-backends.pc
%define _state stable
%define orgname kdeadmin
-%define qtver 4.4.0
+%define qtver 4.4.3
%include /usr/lib/rpm/macros.perl
@@ -15,26 +14,28 @@
Summary(pt_BR.UTF-8): K Desktop Environment - ferramentas administrativas
Summary(zh_CN.UTF-8): KDE管理工具
Name: kde4-kdeadmin
-Version: 4.1.0
-Release: 1
+Version: 4.2.0
+Release: 3
License: GPL v2+
Group: X11/Applications
Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5: c814d39956c605a8cc60016a26a9401f
+# Source0-md5: 2c5b33477b5679bcd9fdbc1f8017e6fb
Patch0: %{name}-liloconfig.patch
+Patch1: %{name}-printer.patch
URL: http://www.kde.org/
BuildRequires: Qt3Support-devel >= %{qtver}
BuildRequires: QtCore-devel >= %{qtver}
BuildRequires: QtGui-devel >= %{qtver}
BuildRequires: QtTest-devel >= %{qtver}
-BuildRequires: automoc4 >= 0.9.83
+BuildRequires: automoc4 >= 0.9.88
BuildRequires: bzip2-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.2
BuildRequires: kde4-kdelibs-devel >= %{version}
BuildRequires: kde4-kdepimlibs-devel >= %{version}
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: pam-devel
+BuildRequires: python-PyQt4-devel
BuildRequires: qt4-qmake >= %{qtver}
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: rpmbuild(macros) >= 1.213
@@ -66,7 +67,7 @@
Summary: LILO Configurator
Summary(pl.UTF-8): Konfigurator LILO
Group: X11/Applications
-Requires: kde4-kdebase-core >= %{version}
+Requires: kde4-kdebase >= %{version}
Requires: lilo
Obsoletes: kdeadmin-kcmlinuz < 8:3.4.0
@@ -81,7 +82,7 @@
Summary(pl.UTF-8): Program do zlecania zadań dla KDE (graficzny interfejs do crona)
Summary(pt_BR.UTF-8): Gerenciador/agendador de tarefas e interface para o cron
Group: X11/Applications
-Requires: kde4-kdebase-core >= %{version}
+Requires: kde4-kdebase >= %{version}
%description kcron
KCron is an application for scheduling programs to run in the
@@ -89,8 +90,8 @@
scheduler.
%description kcron -l pl.UTF-8
-KCron to aplikacja do planowania uruchamiania programów w tle. Jest
-to graficzny interfejs do crona - systemowego programu do planowego
+KCron to aplikacja do planowania uruchamiania programów w tle. Jest to
+graficzny interfejs do crona - systemowego programu do planowego
uruchamiania programów w systemach uniksowych.
%description kcron -l pt_BR.UTF-8
@@ -101,7 +102,7 @@
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-core >= %{version}
+Requires: kde4-kdebase >= %{version}
Provides: kpackage
Obsoletes: kpackage
@@ -118,43 +119,36 @@
%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 >= %{version}
+Requires: system-config-printer
+
+%description kprinter
+Printer configuration for KDE4
+
%package ksystemlog
Summary: KDE4 system logger
Group: X11/Applications
-Requires: kde4-kdebase-core >= %{version}
+Requires: kde4-kdebase >= %{version}
%description ksystemlog
A system logger for KDE4.
-#%package ksysv #Summary: KDE SysV init configurator
-#Summary(pl.UTF-8): Konfigurator SysV Init dla KDE
-#Summary(pt_BR.UTF-8): Interface para administração da
-inicialização System V #Group: X11/Applications #Requires:
-kde4-kdebase-core >= %{version}
-
-#%description ksysv #A SysV init configurator for KDE.
-
-#%description ksysv -l pl.UTF-8 #Program do konfiguracji startu
-systemu wykorzystującego program init #w stylu SysV.
-
-#%description ksysv -l pt_BR.UTF-8 #Interface para administração da
-inicialização System V, com #visualização e manipulação gráfica
-e facilitada dos serviços #disponíveis bem como dos níveis de
-execução.
-
%package kuser
Summary: KDE User management tool
Summary(pl.UTF-8): Administracja kontami dla KDE
Summary(pt_BR.UTF-8): Ferramenta para administração de usuários
Group: X11/Applications
-Requires: kde4-kdebase-core >= %{version}
+Requires: kde4-kdebase >= %{version}
%description kuser
A simple tool for managin system groups and user accounts from system.
%description kuser -l pl.UTF-8
-Narzędzie do dodawania/usuwania użytkowników oraz do zmiany danych
-o nich.
+Narzędzie do dodawania/usuwania użytkowników oraz do zmiany danych o
+nich.
%description kuser -l pt_BR.UTF-8
Ferramenta para administração de usuários do sistema.
@@ -174,6 +168,7 @@
%prep
%setup -q -n %{orgname}-%{version}
%patch0 -p0
+%patch1 -p1
%build
install -d build
@@ -181,9 +176,10 @@
%cmake \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
+ -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE \
%if "%{_lib}" == "lib64"
-DLIB_SUFFIX=64 \
-%endif
+%endif
../
%{__make}
@@ -195,11 +191,10 @@
kde_htmldir=%{_kdedocdir}
%find_lang kcron --with-kde
-#%find_lang kdat --with-kde
+#%find_lang kdat --with-kde
%find_lang kpackage --with-kde
-#%find_lang ksysv --with-kde
%find_lang kuser --with-kde
-%find_lang knetworkconf --with-kde
+#%find_lang knetworkconf --with-kde
%ifarch %{ix86} %{x8664}
%find_lang lilo-config --with-kde
%endif
@@ -229,6 +224,16 @@
%{_desktopdir}/kde4/kpackage.desktop
%{_iconsdir}/*/*/*/kpackage.png
%{_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)
@@ -237,14 +242,9 @@
%{_desktopdir}/kde4/ksystemlog.desktop
%{_datadir}/apps/ksystemlog/ksystemlogui.rc
%{_iconsdir}/hicolor/*/apps/ksystemlog.png
-%{_iconsdir}/hicolor/scalable/apps/ksystemlog.svgz
+#%{_iconsdir}/hicolor/scalable/apps/ksystemlog.svgz
%{_kdedocdir}/en/ksystemlog
-#%files ksysv
-#%defattr(644,root,root,755)
-# XXX: it's (stub?) pam policy configurator, not init!
-#%attr(755,root,root) %{_bindir}/secpolicy
-
%files kuser -f kuser.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kuser
@@ -253,7 +253,7 @@
%{_desktopdir}/kde4/kuser.desktop
%{_iconsdir}/*/*/*/kuser.png
-%files knetworkconf -f knetworkconf.lang
+%files knetworkconf
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/kde4/kcm_knetworkconf*.so
%dir %{_datadir}/apps/knetworkconf
@@ -272,11 +272,99 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.42 2008/08/13 10:39:44 shadzik
+Revision 1.43 2009/02/03 15:56:38 shadzik
+- merged from DEVEL
+- 4.2.0 stable
+- rel 3
+
+Revision 1.40.2.28 2009/01/22 19:29:42 shadzik
+- updated automoc4 BR; rel 2
+
+Revision 1.40.2.27 2009/01/22 15:55:30 shadzik
+- 4.2.0
+
+Revision 1.40.2.26 2009/01/07 19:58:28 shadzik
+- 4.2 RC1
+
+Revision 1.40.2.25 2009/01/05 17:53:39 glen
+- revert source url change
+
+Revision 1.40.2.24 2009/01/03 16:19:38 rotom
+- up to 4.1.87
+
+Revision 1.40.2.23 2008/12/15 17:51:50 shadzik
+- 4.1.85
+
+Revision 1.40.2.22 2008/12/08 16:16:37 paszczus
+- updated to 4.1.82
+
+Revision 1.40.2.21 2008/11/29 04:40:51 shadzik
+- 4.1.81
+
+Revision 1.40.2.20 2008/11/26 20:44:45 shadzik
+- 4.2 beta1
+
+Revision 1.40.2.19 2008/11/14 09:18:54 paszczus
+- updated to 4.1.73
+
+Revision 1.40.2.18 2008/11/06 08:41:21 shadzik
+- 4.1.72
+
+Revision 1.40.2.17 2008/10/23 17:38:03 paszczus
+- updated to 4.1.71
+
+Revision 1.40.2.16 2008/10/20 00:58:38 shadzik
+- removed ksysv for good
+
+Revision 1.40.2.15 2008/10/20 00:55:57 shadzik
+- rel up and qtver bump up
+
+Revision 1.40.2.14 2008/10/20 00:52:02 shadzik
+- s/kde4-kdebase-core/kde4-kdebase/g in Rs
+
+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
+
+Revision 1.40.2.11 2008/10/02 15:21:13 paszczus
+- updated to 4.1.68
+
+Revision 1.40.2.10 2008/09/19 20:34:57 paszczus
+- updated to 4.1.67
+- adaptarized
+
+Revision 1.40.2.9 2008/09/04 20:30:51 paszczus
+- updated to 4.1.65
+
+Revision 1.40.2.8 2008/08/30 23:35:28 shadzik
+- 4.1.64
+
+Revision 1.40.2.7 2008/08/21 18:54:18 paszczus
+- updated to 4.1.63
+
+Revision 1.40.2.6 2008/08/17 22:35:04 shadzik
+- 4.1.62
+
+Revision 1.40.2.5 2008/08/15 11:54:04 shadzik
+- cmake fix now in cmake itself
+
+Revision 1.40.2.4 2008/08/13 10:17:05 shadzik
- BR: QtTest-devel
-Revision 1.41 2008/08/12 17:29:21 shadzik
+Revision 1.40.2.3 2008/08/12 17:27:52 shadzik
- BRs
+
+Revision 1.40.2.2 2008/08/12 17:14:04 shadzik
+- some BRs
+- some updated
+
+Revision 1.40.2.1 2008/08/11 10:26:16 paszczus
+- updated to 4.1.61
+- added fix for cmake >= 2.6.0
Revision 1.40 2008/07/24 13:54:17 paszczus
- updated to stable 4.1.0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdeadmin.spec?r1=1.42&r2=1.43&f=u
More information about the pld-cvs-commit
mailing list