# ChangeLog for app-admin/system-config-printer-common
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.16 2010/03/31 14:43:40 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.17 2010/05/17 19:11:39 reavertm Exp $
+
+*system-config-printer-common-1.2.2 (17 May 2010)
+
+ 17 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+ -system-config-printer-common-1.1.18-r2.ebuild,
+ -files/system-config-printer-common-1.1.18-split.patch,
+ +system-config-printer-common-1.2.2.ebuild,
+ +files/system-config-printer-common-1.2.2-split.patch:
+ Version bump, remove old, bug 319989
31 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
system-config-printer-common-1.1.13.ebuild,
-diff -ru ../system-config-printer-1.1.18/configure.in ./configure.in
---- ../system-config-printer-1.1.18/configure.in 2010-03-10 10:33:54.000000000 +0100
-+++ ./configure.in 2010-03-11 02:24:38.787452516 +0100
-@@ -1,6 +1,6 @@
- AC_INIT(system-config-printer, 1.1.18)
- AC_CONFIG_SRCDIR(system-config-printer.py)
--AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
-+AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
- IT_PROG_INTLTOOL
- AM_GNU_GETTEXT([external])
- AM_PATH_PYTHON
-diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
---- ../system-config-printer-1.1.18/Makefile.am 2010-03-10 10:33:45.000000000 +0100
-+++ ./Makefile.am 2010-03-11 02:31:02.771055111 +0100
-@@ -71,90 +71,20 @@
+diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
+--- ../system-config-printer-1.2.2/Makefile.am 2010-05-07 16:19:03.000000000 +0200
++++ ./Makefile.am 2010-05-17 20:36:37.657216914 +0200
+@@ -70,91 +70,20 @@
rm -f .stamp-distutils-in-builddir
nobase_pkgdata_SCRIPTS= \
-- my-default-printer.py \
- check-device-ids.py \
- pysmb.py \
- system-config-printer.py \
- AdvancedServerSettings.py \
- asyncconn.py \
- asyncipp.py \
-- asyncpk0.py \
- asyncpk1.py \
- authconn.py \
config.py \
- cupspk.py \
debug.py \
+- dnssdresolve.py \
- errordialogs.py \
- HIG.py \
- firewall.py \
-- glade.py \
+- gui.py \
- GroupsPane.py \
- GroupsPaneModel.py \
- gtkinklevel.py \
- gtkspinner.py \
+- installdriver.py \
installpackage.py \
- jobviewer.py \
monitor.py \
- optionwidgets.py \
PhysicalDevice.py \
ppdippstr.py \
+- ppdsloader.py \
probe_printer.py \
- gtk_label_autowrap.py \
SearchCriterion.py \
- ToolbarSearchEntry.py \
- userdefault.py \
- XmlHelper.py \
-- glade/AboutDialog.glade \
-- glade/ConnectDialog.glade \
-- glade/ConnectingDialog.glade \
-- glade/InstallDialog.glade \
-- glade/JobsWindow.glade \
-- glade/NewPrinterName.glade \
-- glade/NewPrinterWindow.glade \
-- glade/PrinterPropertiesDialog.glade \
-- glade/PrintersWindow.glade \
-- glade/ServerSettingsDialog.glade \
-- glade/SMBBrowseDialog.glade \
-- glade/statusicon_popupmenu.glade \
-- glade/WaitWindow.glade \
+- ui/AboutDialog.glade \
+- ui/ConnectDialog.glade \
+- ui/ConnectingDialog.glade \
+- ui/InstallDialog.glade \
+- ui/JobsWindow.glade \
+- ui/NewPrinterName.glade \
+- ui/NewPrinterWindow.glade \
+- ui/PrinterPropertiesDialog.glade \
+- ui/PrintersWindow.glade \
+- ui/ServerSettingsDialog.glade \
+- ui/SMBBrowseDialog.glade \
+- ui/statusicon_popupmenu.glade \
+- ui/WaitWindow.glade \
- icons/i-network-printer.png \
- troubleshoot/base.py \
- troubleshoot/CheckLocalServerPublishing.py \
- troubleshoot/CheckNetworkServerSanity.py \
- troubleshoot/CheckPPDSanity.py \
- troubleshoot/CheckPrinterSanity.py \
+- troubleshoot/CheckSELinux.py \
- troubleshoot/CheckUSBPermissions.py \
- troubleshoot/ChooseNetworkPrinter.py \
- troubleshoot/ChoosePrinter.py \
-
-bin_SCRIPTS=\
- system-config-printer \
-- system-config-printer-applet \
-- my-default-printer
+- system-config-printer-applet
+ XmlHelper.py
if UDEV_RULES
udevrulesdir=/lib/udev/rules.d
-@@ -169,61 +99,16 @@
+@@ -169,56 +98,17 @@
udev/udev-add-printer
endif
- man/system-config-printer.1 \
- man/system-config-printer-applet.1
-
- dbus_DATA =\
- newprinternotification.conf
+ dbus_DATA = \
+ newprinternotification.conf \
+ printerdriversinstaller.conf
dbusdir = $(sysconfdir)/dbus-1/system.d/
-desktop_DATA =\
- system-config-printer.desktop \
- print-applet.desktop \
-- manage-print-jobs.desktop \
-- my-default-printer.desktop
+- manage-print-jobs.desktop
desktopdir = $(datadir)/applications/
autostartdir = $(sysconfdir)/xdg/autostart/
- --add-category GTK \
- manage-print-jobs.desktop
- desktop-file-install $(DESKTOP_VENDOR) \
-- --dir $(DESTDIR)$(desktopdir) \
-- --add-category Settings \
-- --add-category HardwareSettings \
-- --add-category GTK \
-- my-default-printer.desktop
-- desktop-file-install $(DESKTOP_VENDOR) \
- --dir $(DESTDIR)$(autostartdir) \
- --add-category System \
- --add-category Monitor \
-uninstall-desktopDATA:
- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop
- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)manage-print-jobs.desktop
-- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)my-default-printer.desktop
- rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
+-
+-desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
-
EXTRA_DIST=\
$(nobase_pkgdata_SCRIPTS) \
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.1.18-r2.ebuild,v 1.3 2010/03/31 14:51:55 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.2.2.ebuild,v 1.1 2010/05/17 19:11:39 reavertm Exp $
EAPI="3"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2"
inherit python autotools
MY_P="${PN%-common}-${PV}"
DESCRIPTION="Common modules of Red Hat's printer administration tool"
HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
-SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.1/${MY_P}.tar.bz2"
+SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.2/${MY_P}.tar.xz"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
# system-config-printer split since 1.1.3
COMMON_DEPEND="
+ dev-libs/libusb
dev-libs/libxml2[python]
dev-python/dbus-python
dev-python/pycups
dev-python/pygobject
net-print/cups[dbus]
+ sys-fs/udev
"
DEPEND="${COMMON_DEPEND}
dev-util/intltool
src_configure() {
econf \
--disable-nls \
- --with-polkit-1
+ --with-udev-rules
}
src_compile() {
emake DESTDIR="${D}" install || die "emake install failed"
- python_convert_shebangs -q -r $(python_get_version) "${D}"usr/share/system-config-printer
+ python_convert_shebangs -q -r $(python_get_version) "${D}"
}
pkg_postinst() {
# ChangeLog for app-admin/system-config-printer-gnome
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.5 2010/05/16 14:58:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.6 2010/05/17 19:12:39 reavertm Exp $
+
+*system-config-printer-gnome-1.2.2 (17 May 2010)
+
+ 17 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+ -system-config-printer-gnome-1.1.18-r1.ebuild,
+ -files/system-config-printer-gnome-1.1.18-split.patch,
+ +system-config-printer-gnome-1.2.2.ebuild,
+ +files/system-config-printer-gnome-1.2.2-split.patch:
+ Version bump, remove old, bug 319989
16 May 2010; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Fix maintainer's email.
--- /dev/null
+diff -up system-config-printer-1.2.2/asyncpk1.py.cupspk-fileget-tmp system-config-printer-1.2.2/asyncpk1.py
+--- system-config-printer-1.2.2/asyncpk1.py.cupspk-fileget-tmp 2010-05-07 15:19:03.000000000 +0100
++++ system-config-printer-1.2.2/asyncpk1.py 2010-05-13 13:00:57.759093485 +0100
+@@ -153,7 +153,10 @@ class _WriteToTmpFile:
+ def __init__ (self, kwds, reply_handler, error_handler):
+ self._reply_handler = reply_handler
+ self._error_handler = error_handler
+- (tmpfd, tmpfname) = tempfile.mkstemp ()
++
++ # Create the temporary file in /tmp to ensure that
++ # cups-pk-helper-mechanism is able to write to it.
++ (tmpfd, tmpfname) = tempfile.mkstemp (dir="/tmp")
+ os.close (tmpfd)
+ self._filename = tmpfname
+ debugprint ("Created tempfile %s" % tmpfname)
+diff -up system-config-printer-1.2.2/cupspk.py.cupspk-fileget-tmp system-config-printer-1.2.2/cupspk.py
+--- system-config-printer-1.2.2/cupspk.py.cupspk-fileget-tmp 2010-04-15 00:11:33.000000000 +0100
++++ system-config-printer-1.2.2/cupspk.py 2010-05-13 13:00:57.760093336 +0100
+@@ -385,7 +385,9 @@ class Connection:
+ filename = None
+
+ if (not use_pycups) and (fd != None or file_object != None):
+- (tmpfd, tmpfname) = tempfile.mkstemp()
++ # Create the temporary file in /tmp to ensure that
++ # cups-pk-helper-mechanism is able to write to it.
++ (tmpfd, tmpfname) = tempfile.mkstemp(dir="/tmp")
+ os.close (tmpfd)
+
+ pk_args = (resource, tmpfname)
-diff -ru ../system-config-printer-1.1.18/configure.in ./configure.in
---- ../system-config-printer-1.1.18/configure.in 2010-03-10 10:33:54.000000000 +0100
-+++ ./configure.in 2010-03-11 02:52:12.740702738 +0100
-@@ -1,6 +1,6 @@
- AC_INIT(system-config-printer, 1.1.18)
- AC_CONFIG_SRCDIR(system-config-printer.py)
--AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
-+AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
- IT_PROG_INTLTOOL
- AM_GNU_GETTEXT([external])
- AM_PATH_PYTHON
-diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
---- ../system-config-printer-1.1.18/Makefile.am 2010-03-10 10:33:45.000000000 +0100
-+++ ./Makefile.am 2010-03-11 02:54:55.390957640 +0100
-@@ -2,78 +2,9 @@
+diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
+--- ../system-config-printer-1.2.2/Makefile.am 2010-05-07 16:19:03.000000000 +0200
++++ ./Makefile.am 2010-05-17 20:39:12.278375860 +0200
+@@ -2,76 +2,8 @@
SUBDIRS=po
- -e "s|\@localedir\@|$(localedir)|" \
- -e "s|\@VERSION\@|$(VERSION)|" \
- -e "s|\@PACKAGE\@|$(PACKAGE)|" \
-- -e "s|\@WITH_POLKIT_1\@|$(WITH_POLKIT_1)|" \
- $< > $@
-
-# Use distutils to build the module.
- rm -f .stamp-distutils-in-builddir
-
nobase_pkgdata_SCRIPTS= \
- my-default-printer.py \
check-device-ids.py \
- pysmb.py \
system-config-printer.py \
troubleshoot/__init__.py \
applet.py
-@@ -85,9 +16,7 @@
- asyncpk0.py \
+@@ -82,9 +14,7 @@
+ asyncipp.py \
asyncpk1.py \
authconn.py \
- config.py \
cupspk.py \
- debug.py \
+ dnssdresolve.py \
errordialogs.py \
HIG.py \
- firewall.py \
-@@ -96,22 +25,13 @@
- GroupsPaneModel.py \
+@@ -95,23 +25,14 @@
gtkinklevel.py \
gtkspinner.py \
+ installdriver.py \
- installpackage.py \
jobviewer.py \
- monitor.py \
optionwidgets.py \
- PhysicalDevice.py \
- ppdippstr.py \
+ ppdsloader.py \
- probe_printer.py \
gtk_label_autowrap.py \
- SearchCriterion.py \
ToolbarSearchEntry.py \
userdefault.py \
- XmlHelper.py \
- glade/AboutDialog.glade \
- glade/ConnectDialog.glade \
- glade/ConnectingDialog.glade \
-@@ -173,8 +93,6 @@
+ ui/AboutDialog.glade \
+ ui/ConnectDialog.glade \
+ ui/ConnectingDialog.glade \
+@@ -173,11 +94,6 @@
man/system-config-printer.1 \
man/system-config-printer-applet.1
--dbus_DATA =\
-- newprinternotification.conf
- dbusdir = $(sysconfdir)/dbus-1/system.d/
-
+-dbus_DATA = \
+- newprinternotification.conf \
+- printerdriversinstaller.conf
+-dbusdir = $(sysconfdir)/dbus-1/system.d/
+-
desktop_DATA =\
+ system-config-printer.desktop \
+ print-applet.desktop \
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.18-r1.ebuild,v 1.3 2010/03/31 14:50:50 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild,v 1.1 2010/05/17 19:12:39 reavertm Exp $
EAPI="3"
+
PYTHON_DEPEND="2"
inherit python autotools
DESCRIPTION="GNOME frontend for a Red Hat's printer administration tool"
HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
-SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.1/${MY_P}.tar.bz2"
+SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.2/${MY_P}.tar.xz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
src_prepare() {
epatch "${FILESDIR}/${P}-split.patch"
+ # Upstream bug #587744
+ epatch "${FILESDIR}/${P}-cupspk-fileget-tmp.patch"
+
eautoreconf
}
emake DESTDIR="${D}" install || die "emake install failed"
- python_convert_shebangs -q -r $(python_get_version) "${D}"usr/share/system-config-printer
+ python_convert_shebangs -q -r $(python_get_version) "${D}"
}
pkg_postrm() {
projects / gentoo.git / commitdiff