rpms/kdeadmin/F-11 kdeadmin-4.2.85-printing.patch, NONE, 1.1 .cvsignore, 1.62, 1.63 kdeadmin.spec, 1.134, 1.135 sources, 1.63, 1.64 kdeadmin-4.2.2-printing.patch, 1.4, NONE
Rex Dieter
rdieter at fedoraproject.org
Wed Aug 5 02:55:25 UTC 2009
- Previous message (by thread): rpms/kdeedu/F-11 .cvsignore, 1.65, 1.66 kdeedu.spec, 1.178, 1.179 sources, 1.66, 1.67
- Next message (by thread): rpms/kdeadmin/F-10 kdeadmin-4.2.85-printing.patch, NONE, 1.1 .cvsignore, 1.58, 1.59 kdeadmin.spec, 1.121, 1.122 sources, 1.62, 1.63 kdeadmin-4.2.2-printing.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdeadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24050/F-11
Modified Files:
.cvsignore kdeadmin.spec sources
Added Files:
kdeadmin-4.2.85-printing.patch
Removed Files:
kdeadmin-4.2.2-printing.patch
Log Message:
kde-4.3.0
kdeadmin-4.2.85-printing.patch:
CMakeLists.txt | 28 ++----------
debug.py | 55 ++++++++++++++++++++++++
smburi.py | 95 +++++++++++++++++++++++++++++++++++++++++++
system-config-printer-kde.py | 3 -
4 files changed, 156 insertions(+), 25 deletions(-)
--- NEW FILE kdeadmin-4.2.85-printing.patch ---
diff -Nur kdeadmin-4.2.85/system-config-printer-kde/CMakeLists.txt kdeadmin-4.2.85-printing/system-config-printer-kde/CMakeLists.txt
--- kdeadmin-4.2.85/system-config-printer-kde/CMakeLists.txt 2009-04-28 15:47:13.000000000 +0200
+++ kdeadmin-4.2.85-printing/system-config-printer-kde/CMakeLists.txt 2009-05-20 16:00:15.000000000 +0200
@@ -5,29 +5,9 @@
macro_optional_find_package(PythonLibrary)
macro_optional_find_package(SIP)
-macro_optional_find_package(PyQt4)
-IF(NOT PYQT4_FOUND)
- macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found. It is needed by system-config-printer-kde to run. (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/pyqt/" FALSE)
-ENDIF(NOT PYQT4_FOUND)
-
-macro_optional_find_package(PyKDE4)
-IF(NOT PYKDE4_FOUND)
- macro_log_feature(PYKDE_FOUND "PyKDE4" "PyKDE4 was not found. It is needed by system-config-printer-kde to run. (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
-ENDIF(NOT PYKDE4_FOUND)
-
-macro_optional_find_package(PyCups)
-IF(NOT PYCUPS_FOUND)
- macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found. It is needed by system-config-printer-kde to run. (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYCUPS_FOUND)
-
-macro_optional_find_package(SystemConfigPrinter)
-IF(NOT SYSTEMCONFIGPRINTER_FOUND)
- macro_log_feature(SYSTEMCONFIGPRINTER_FOUND "system-config-printer" "system-config-printer was not found. Some of its modules (cupshelpers.py, config.py, smburi.py and debug.py) are required by system-config-printer-kde." "http://cyberelk.net/tim/software/system-config-printer/" FALSE)
-ENDIF(NOT SYSTEMCONFIGPRINTER_FOUND)
-
-IF(PYQT4_FOUND AND PYKDE4_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
- SET(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE4_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
+if(PYTHONLIBRARY_FOUND)
+ set(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
+endif(PYTHONLIBRARY_FOUND)
IF(INSTALL_SYSTEM_CONFIG_PRINTER)
install( FILES
@@ -36,6 +16,8 @@
system-config-printer-kde.py
options.py
optionwidgets.py
+ debug.py
+ smburi.py
ipp-browse-dialog.ui
smb-browse-dialog.ui
DESTINATION ${DATA_INSTALL_DIR}/system-config-printer-kde )
diff -Nur kdeadmin-4.2.85/system-config-printer-kde/debug.py kdeadmin-4.2.85-printing/system-config-printer-kde/debug.py
--- kdeadmin-4.2.85/system-config-printer-kde/debug.py 1970-01-01 01:00:00.000000000 +0100
+++ kdeadmin-4.2.85-printing/system-config-printer-kde/debug.py 2009-05-20 15:57:50.000000000 +0200
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+## Copyright (C) 2008 Red Hat, Inc.
+## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sys
+import traceback
+
+_debug=False
+def debugprint (x):
+ if _debug:
+ try:
+ print >>sys.stderr, x
+ except:
+ pass
+
+def get_debugging ():
+ return _debug
+
+def set_debugging (d):
+ global _debug
+ _debug = d
+
+def fatalException (exitcode=1):
+ nonfatalException (type="fatal", end="Exiting")
+ sys.exit (exitcode)
+
+def nonfatalException (type="non-fatal", end="Continuing anyway.."):
+ d = get_debugging ()
+ set_debugging (True)
+ debugprint ("Caught %s exception. Traceback:" % type)
+ (type, value, tb) = sys.exc_info ()
+ tblast = traceback.extract_tb (tb, limit=None)
+ if len (tblast):
+ tblast = tblast[:len (tblast) - 1]
+ extxt = traceback.format_exception_only (type, value)
+ for line in traceback.format_tb(tb):
+ debugprint (line.strip ())
+ debugprint (extxt[0].strip ())
+ debugprint (end)
+ set_debugging (d)
diff -Nur kdeadmin-4.2.85/system-config-printer-kde/smburi.py kdeadmin-4.2.85-printing/system-config-printer-kde/smburi.py
--- kdeadmin-4.2.85/system-config-printer-kde/smburi.py 1970-01-01 01:00:00.000000000 +0100
+++ kdeadmin-4.2.85-printing/system-config-printer-kde/smburi.py 2009-05-20 15:57:50.000000000 +0200
@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+
+## system-config-printer
+
+## Copyright (C) 2006, 2007, 2008 Red Hat, Inc.
+## Copyright (C) 2006, 2007 Florian Festi <ffesti at redhat.com>
+## Copyright (C) 2006, 2007, 2008 Tim Waugh <twaugh at redhat.com>
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import urllib
+
+class SMBURI:
+ def __init__ (self,
+ uri=None,
+ group='', host='', share='', user='', password=''):
+ if uri:
+ if group or host or share or user or password:
+ raise RuntimeError
+
+ if uri.startswith ("smb://"):
+ uri = uri[6:]
+
+ self.uri = uri
+ else:
+ self.uri = self._construct (group, host, share,
+ user=user, password=password)
+
+ def _construct (self, group, host, share, user='', password=''):
+ uri_password = ''
+ if password:
+ uri_password = ':' + urllib.quote (password)
+ if user:
+ uri_password += '@'
+ uri = "%s%s%s" % (urllib.quote (user),
+ uri_password,
+ urllib.quote (group))
+ if len (group) > 0:
+ uri += '/'
+ uri += urllib.quote (host)
+ if len (share) > 0:
+ uri += "/" + urllib.quote (share)
+ return uri
+
+ def get_uri (self):
+ return self.uri
+
+ def sanitize_uri (self):
+ group, host, share, user, password = self.separate ()
+ return self._construct (group, host, share)
+
+ def separate (self):
+ uri = self.get_uri ()
+ user = ''
+ password = ''
+ auth = uri.find ('@')
+ if auth != -1:
+ u = uri[:auth].find(':')
+ if u != -1:
+ user = uri[:u]
+ password = uri[u + 1:auth]
+ else:
+ user = uri[:auth]
+ uri = uri[auth + 1:]
+ sep = uri.count ('/')
+ group = ''
+ if sep == 2:
+ g = uri.find('/')
+ group = uri[:g]
+ uri = uri[g + 1:]
+ if sep < 1:
+ host = ''
+ else:
+ h = uri.find('/')
+ host = uri[:h]
+ uri = uri[h + 1:]
+ p = host.find(':')
+ if p != -1:
+ host = host[:p]
+ share = uri
+ return (urllib.unquote (group), urllib.unquote (host),
+ urllib.unquote (share),
+ urllib.unquote (user), urllib.unquote (password))
diff -Nur kdeadmin-4.2.85/system-config-printer-kde/system-config-printer-kde.py kdeadmin-4.2.85-printing/system-config-printer-kde/system-config-printer-kde.py
--- kdeadmin-4.2.85/system-config-printer-kde/system-config-printer-kde.py 2009-04-15 12:26:27.000000000 +0200
+++ kdeadmin-4.2.85-printing/system-config-printer-kde/system-config-printer-kde.py 2009-05-20 16:05:17.000000000 +0200
@@ -34,7 +34,7 @@
import sys, os, time, traceback, re, tempfile, httplib, thread
#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"
+SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/kde4/apps/system-config-printer-kde"
if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/debug.py"):
sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
@@ -66,7 +66,6 @@
cups.require ("1.9.27")
# These come from system-config-printer
-import config
import cupshelpers, options
from optionwidgets import OptionWidget
from smburi import SMBURI
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-11/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore 29 May 2009 13:39:29 -0000 1.62
+++ .cvsignore 5 Aug 2009 02:55:25 -0000 1.63
@@ -1 +1,5 @@
-kdeadmin-4.2.4.tar.bz2
+kdeadmin-4.2.90.tar.bz2
+kdeadmin-4.2.95.tar.bz2
+kdeadmin-4.2.96.tar.bz2
+kdeadmin-4.2.98.tar.bz2
+kdeadmin-4.3.0.tar.bz2
Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-11/kdeadmin.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- kdeadmin.spec 29 May 2009 13:39:29 -0000 1.134
+++ kdeadmin.spec 5 Aug 2009 02:55:25 -0000 1.135
@@ -1,26 +1,39 @@
+%if 0%{?fedora}
+%define system_config_printer_kde 1
+%define include_kpackage 1
+%endif
+
Name: kdeadmin
+Summary: K Desktop Environment - Administrative tools
Epoch: 7
-Version: 4.2.4
+Version: 4.3.0
Release: 1%{?dist}
-Summary: K Desktop Environment - Administrative tools
Group: User Interface/Desktops
License: GPLv2
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0: kdeadmin-4.2.2-printing.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source1: kuser.pam
Source2: kuser.pamd
+# FIXME/TODO: upstream this -- Rex
+Patch0: kdeadmin-4.2.85-printing.patch
+
+# upstream patches
+
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: python
+BuildRequires: python-devel
Requires: kdelibs4 >= %{version}
Requires: kdepimlibs >= %{version}
+%if ! 0%{?system_config_printer_kde}
+Obsoletes: system-config-printer-kde < %{epoch}:%{version}-%{release}
+%endif
+
%description
The %{name} package includes administrative tools including:
* kcron: systemsettings module for the cron task scheduler
@@ -39,9 +52,9 @@ packages, uninstalling them and installi
It is based upon the "Smart Package Manager".
%package -n system-config-printer-kde
-Summary: A printer administration tool for KDE
+Summary: A printer administration tool for KDE
Group: System Environment/Base
-Requires: PyKDE4 >= %{version}
+Requires: PyKDE4
Requires: system-config-printer-libs
%description -n system-config-printer-kde
A printer administration tool for KDE that allows the user to configure
@@ -52,6 +65,8 @@ a CUPS print server.
%setup -q
%patch0 -p1 -b .printing
+# upstream patches
+
%build
mkdir -p %{_target_platform}
@@ -87,6 +102,7 @@ touch --no-create %{_kde4_iconsdir}/hico
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
fi
+%if 0%{?include_kpackage}
%post kpackage
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
@@ -98,8 +114,7 @@ if [ $1 -eq 0 ] ; then
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
fi
-
-
+%endif
%files
%defattr(-,root,root,-)
@@ -112,18 +127,19 @@ fi
%{_kde4_datadir}/applications/kde4/kuser.desktop
%{_kde4_datadir}/applications/kde4/ksystemlog.desktop
%{_kde4_datadir}/config.kcfg/kuser.kcfg
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/kcm_cron.desktop
+%{_kde4_datadir}/kde4/services/kcm_knetworkconfmodule.desktop
%{_kde4_docdir}/HTML/en/kcontrol/
%{_kde4_docdir}/HTML/en/kcron/
%{_kde4_docdir}/HTML/en/ksystemlog/
%{_kde4_docdir}/HTML/en/kuser/
%{_kde4_iconsdir}/hicolor/*/*/knetworkconf.*
-%{_kde4_iconsdir}/hicolor/*/*/ksystemlog.*
%{_kde4_iconsdir}/hicolor/*/*/kuser.*
%{_kde4_iconsdir}/hicolor/*/*/network*
%{_kde4_libdir}/kde4/kcm_cron.so
%{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so
+%if 0%{?include_kpackage}
%files kpackage
%defattr(-,root,root,-)
%{_kde4_bindir}/kpackage
@@ -132,20 +148,52 @@ fi
%{_kde4_datadir}/config.kcfg/kpackageSettings.kcfg
%{_kde4_docdir}/HTML/en/kpackage/
%{_kde4_iconsdir}/hicolor/*/*/kpackage*
+%endif
+%if 0%{?system_config_printer_kde}
%files -n system-config-printer-kde
%defattr(-,root,root,-)
-%{_kde4_bindir}/system-config-printer-kde
-%{_kde4_datadir}/applications/kde4/system-config-printer-kde.desktop
+%{_kde4_datadir}/kde4/services/system-config-printer-kde.desktop
%{_kde4_appsdir}/system-config-printer-kde/
+%endif
%changelog
-* Fri May 29 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Tue Jul 28 2009 Than Ngo <than at redhat.com> - 4.2.98-5
+- don't include kpackage fo rhel
+
+* Mon Jul 27 2009 Than Ngo <than at redhat.com> - 4.2.98-4
+- don't include system_config_printer_kde for rhel
+
+* Mon Jul 27 2009 Than Ngo <than at redhat.com> - 4.2.98-3
+- fix knetworkconf backend to recognize fedora network settings
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.2.90-1
+- KDE 4.3 Beta 2
+
+* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- reenable sytem-config-printer-kde
+- rebase printing patch, drop hunks fixed upstream
+- BR python-devel instead of just python
+- fix file list, system-config-printer-kde is now a System Settings module
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-4
- get rid of the dependency of system-config-printer
@@ -156,7 +204,7 @@ fi
- fix #496646, system-config-printer-kde doesn't start
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
-- optimize scriptlets
+- optimize scriptlets
* Mon Mar 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
- KDE 4.2.2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-11/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources 29 May 2009 13:39:29 -0000 1.63
+++ sources 5 Aug 2009 02:55:25 -0000 1.64
@@ -1 +1 @@
-d88c5a3819924f7f49f50365811a67c7 kdeadmin-4.2.4.tar.bz2
+4712ade616d3c3a987281d24326ee9af kdeadmin-4.3.0.tar.bz2
--- kdeadmin-4.2.2-printing.patch DELETED ---
- Previous message (by thread): rpms/kdeedu/F-11 .cvsignore, 1.65, 1.66 kdeedu.spec, 1.178, 1.179 sources, 1.66, 1.67
- Next message (by thread): rpms/kdeadmin/F-10 kdeadmin-4.2.85-printing.patch, NONE, 1.1 .cvsignore, 1.58, 1.59 kdeadmin.spec, 1.121, 1.122 sources, 1.62, 1.63 kdeadmin-4.2.2-printing.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list