rpms/system-config-printer/F-7 system-config-printer-0.7.74.x.patch, NONE, 1.1 sources, 1.137, 1.138 system-config-printer.spec, 1.109, 1.110
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Wed Oct 24 10:06:16 UTC 2007
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5450
Modified Files:
sources system-config-printer.spec
Added Files:
system-config-printer-0.7.74.x.patch
Log Message:
* Wed Oct 24 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.4-1
- Updated to 0.7.74.4. Numerous changes.
system-config-printer-0.7.74.x.patch:
--- NEW FILE system-config-printer-0.7.74.x.patch ---
Index: applet.py
===================================================================
--- applet.py (.../tags/0.7.74.4) (revision 1676)
+++ applet.py (.../branches/0.7.74.x) (revision 1676)
@@ -175,7 +175,7 @@
self.last_refreshed = 0
self.special_status_icon = False
- self.xml = gtk.glade.XML(APPDIR + "/" + GLADE)
+ self.xml = gtk.glade.XML(APPDIR + "/" + GLADE, domain = DOMAIN)
self.xml.signal_autoconnect(self)
self.treeview = self.xml.get_widget ('treeview')
text=0
Index: po/ja.po
===================================================================
--- po/ja.po (.../tags/0.7.74.4) (revision 1676)
+++ po/ja.po (.../branches/0.7.74.x) (revision 1676)
@@ -2,6 +2,7 @@
# translation of ja.po to Japanese
# print-conf-gui
# Copyright (C) 2001,2002,2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+#
# Yukihiro Nakai <ynakai at redhat.com>, 2001.
# James Hashida <khashida at redhat.com>, 2002,2003.
# Noriko Mizumoto <noriko at redhat.com>, 2003, 2006, 2007.
@@ -527,9 +528,8 @@
msgstr "<b>説明</b> (オプション)"
#: ../system-config-printer.glade.h:18
-#, fuzzy
msgid "<b>Enter device URI</b>"
-msgstr "デãƒã‚¤ã‚¹ URI ã®å…¥åŠ›"
+msgstr "<b>デãƒã‚¤ã‚¹ URI ã®å…¥åŠ›</b>"
#: ../system-config-printer.glade.h:19
msgid "<b>Image Options</b>"
@@ -568,9 +568,8 @@
msgstr "<b>ã“ã®ã‚¯ãƒ©ã‚¹ã®ãƒ¡ãƒ³ãƒãƒ¼ã®ãƒ—リンター</b>"
#: ../system-config-printer.glade.h:28
-#, fuzzy
msgid "<b>SMB Printer</b>"
-msgstr "プリンターå"
+msgstr "<b>SMB プリンター</b>"
#: ../system-config-printer.glade.h:29
msgid "<b>Select Connection</b>"
@@ -647,9 +646,8 @@
msgstr "次ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’除ã„ã¦å…¨å“¡ã«å°åˆ·ã‚’許å¯ã™ã‚‹:"
#: ../system-config-printer.glade.h:49
-#, fuzzy
msgid "Allow printing from the Internet"
-msgstr "次ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’除ã„ã¦å…¨å“¡ã«å°åˆ·ã‚’許å¯ã™ã‚‹:"
+msgstr "インターãƒãƒƒãƒˆã‹ã‚‰ã®å°åˆ·ã‚’許å¯ã™ã‚‹"
#: ../system-config-printer.glade.h:50
msgid "Allow remote administration"
@@ -657,8 +655,7 @@
#: ../system-config-printer.glade.h:51
msgid "Allow users to cancel any job (not just their own)"
-msgstr ""
-"ユーザーã«ä¾é ¼ã‚’ã‚ャンセルã™ã‚‹ã“ã¨ã‚’許å¯ã™ã‚‹ (彼ら自身ã®ã‚‚ã®ã§ãªãã¦ã‚‚)"
+msgstr "ユーザーã«ä¾é ¼ã‚’ã‚ャンセルã™ã‚‹ã“ã¨ã‚’許å¯ã™ã‚‹ (彼ら自身ã®ã‚‚ã®ã§ãªãã¦ã‚‚)"
#: ../system-config-printer.glade.h:52
msgid "Apply"
@@ -941,8 +938,7 @@
#: ../system-config-printer.glade.h:134
msgid "May contain any printable characters except \"/\", \"#\", and space"
-msgstr ""
-"\"/\"〠\"#\"〠空白以外ãªã‚‰å°åˆ·ã§ãã‚‹æ–‡å—ã¯ã™ã¹ã¦å«ã¾ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™"
+msgstr "\"/\"〠\"#\"〠空白以外ãªã‚‰å°åˆ·ã§ãã‚‹æ–‡å—ã¯ã™ã¹ã¦å«ã¾ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™"
#: ../system-config-printer.glade.h:135
msgid "Media:"
@@ -1076,7 +1072,7 @@
#: ../system-config-printer.glade.h:183
msgid "Please Wait"
-msgstr ""
+msgstr "ãŠå¾…ã¡ãã ã•ã„"
#: ../system-config-printer.glade.h:184
msgid "Policies"
@@ -1306,7 +1302,7 @@
#: ../system-config-printer.glade.h:237
msgid "_Install"
-msgstr ""
+msgstr "インストール(_I)"
#: ../system-config-printer.glade.h:238
msgid "_Verify..."
@@ -1611,12 +1607,3 @@
msgid "Select default printer"
msgstr "デフォルトã®ãƒ—リンターをé¸æŠžã™ã‚‹"
-#~ msgid ""
-#~ "This PPD is provided by the manufacturer and is included with the "
-#~ "foomatic package."
-#~ msgstr ""
-#~ "ã“ã® PPD ã¯è£½é€ メーカーã‹ã‚‰æä¾›ã•ã‚Œã¦ãŠã‚Š foomatic パッケージをå«ã‚“ã§ã„ã¾"
-#~ "ã™ã€‚"
-
-#~ msgid "This PPD is provided by CUPS."
-#~ msgstr "ã“ã® PPD 㯠CUPS ã‹ã‚‰æä¾›ã•ã‚Œã¦ã„ã¾ã™ã€‚"
Index: my-default-printer.py
===================================================================
--- my-default-printer.py (.../tags/0.7.74.4) (revision 1676)
+++ my-default-printer.py (.../branches/0.7.74.x) (revision 1676)
@@ -26,7 +26,7 @@
import signal
import sys
-domain='my-default-printer'
+domain='system-config-printer'
import locale
locale.setlocale (locale.LC_ALL, "")
from gettext import gettext as _
Index: pysmb.py
===================================================================
--- pysmb.py (.../tags/0.7.74.4) (revision 1676)
+++ pysmb.py (.../branches/0.7.74.x) (revision 1676)
@@ -3,8 +3,8 @@
## system-config-printer
## CUPS backend
-## Copyright (C) 2002, 2003, 2006 Red Hat, Inc.
-## Copyright (C) 2002, 2003 Tim Waugh <twaugh at redhat.com>
+## Copyright (C) 2002, 2003, 2006, 2007 Red Hat, Inc.
+## Copyright (C) 2002, 2003, 2006, 2007 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
@@ -72,7 +72,8 @@
ips = []
signal.signal (signal.SIGCHLD, signal.SIG_DFL)
if wins:
- str = "LC_ALL=C %s -U %s -M -- - 2>&1" % (nmblookup, wins)
+ os.environ['WINS'] = wins
+ str = 'LC_ALL=C %s -U "$WINS" -M -- - 2>&1' % (nmblookup)
else:
str = "LC_ALL=C %s -M -- - 2>&1" % (nmblookup)
for l in os.popen (str, 'r').readlines ():
@@ -81,7 +82,8 @@
ips.append (l.split(" ")[0])
if len (ips) <= 0:
if wins:
- str = "LC_ALL=C %s -U %s '*' 2>&1" % (nmblookup, wins)
+ os.environ['WINS'] = wins
+ str = 'LC_ALL=C %s -U "$WINS" "*" 2>&1' % (nmblookup)
else:
str = "LC_ALL=C %s '*' 2>&1" % (nmblookup)
for l in os.popen (str, 'r').readlines ():
@@ -91,10 +93,12 @@
for ip in ips:
dom = None
dict = { 'IP': ip }
+ os.environ["IP"] = ip
if wins:
- str = "LC_ALL=C " + nmblookup + " -U " + wins + " -A " + ip
+ os.environ["WINS"] = wins
+ str = 'LC_ALL=C %s -U "$WINS" -A "$IP"' % (nmblookup)
else:
- str = "LC_ALL=C %s -A '%s'" % (nmblookup, ip)
+ str = 'LC_ALL=C %s -A "$IP"' % (nmblookup)
str += " 2>&1"
for line in os.popen(str, 'r').readlines():
line = line.splitlines()[0]
@@ -120,7 +124,8 @@
domainregex = re.compile("\s*Workgroup\s*Master")
commentregex = re.compile("(\s*-+)+")
signal.signal (signal.SIGCHLD, signal.SIG_DFL)
- str = " %s -N -L //%s 2>/dev/null" % (smbclient, dmbip)
+ os.environ["DMBIP"] = dmbip
+ str = 'LC_ALL=C %s -N -L "//$DMBIP" 2>/dev/null' % (smbclient)
for l in os.popen (str, 'r').readlines ():
l = l.splitlines()[0]
@@ -175,10 +180,12 @@
for ip in ips:
name = None
dict = { 'IP': ip }
+ os.environ["IP"] = ip
if wins:
- str = "LC_ALL=C " + nmblookup + " -U " + wins + " -A " + ip
+ os.environ["WINS"] = wins
+ str = 'LC_ALL=C %s -U "$WINS" -A "$IP"' % (nmblookup)
else:
- str = "LC_ALL=C %s -A '%s'" % (nmblookup, ip)
+ str = 'LC_ALL=C %s -A "$IP"' % (nmblookup)
str += " 2>&1"
for line in os.popen(str, 'r').readlines():
line = line.splitlines()[0]
@@ -198,10 +205,12 @@
"""Given an SMB name, returns a host dict for it."""
dict = { 'NAME': smbname, 'IP': '', 'GROUP': '' }
global wins
+ os.environ["SMBNAME"] = smbname
if wins:
- str = "LC_ALL=C %s -U %s -S '%s' 2>&1" % (nmblookup, wins, smbname)
+ os.environ["WINS"] = wins
+ str = 'LC_ALL=C %s -U "$WINS" -S "$SMBNAME" 2>&1' % (nmblookup)
else:
- str = "LC_ALL=C %s -S '%s' 2>&1" % (nmblookup, smbname)
+ str = 'LC_ALL=C %s -S "$SMBNAME" 2>&1' % (nmblookup)
for l in os.popen (str, 'r').readlines ():
l = l.strip ()
if l.endswith ("<00>"):
@@ -227,12 +236,15 @@
if not os.access (smbclient, os.X_OK):
return printers
- str = "LC_ALL=C %s -N -L '%s' 2>&1" % (smbclient, host['NAME'])
+ os.environ["NAME"] = host['NAME']
+ str = 'LC_ALL=C %s -N -L "$NAME" 2>&1' % (smbclient)
if host.has_key ('IP'):
- str += " -I '%s'" % host['IP']
+ os.environ["IP"] = host['IP']
+ str += ' -I "$IP"'
if host.has_key ('GROUP'):
- str += " -W '%s'" % host['GROUP']
+ os.environ["GROUP"] = host['GROUP']
+ str += ' -W "$GROUP"'
signal.signal (signal.SIGCHLD, signal.SIG_DFL)
section = 0
@@ -310,7 +322,7 @@
os.dup2 (write, 1)
os.dup2 (1, 2)
- os.environ['LANG'] = 'C'
+ os.environ['LC_ALL'] = 'C'
os.execv (args[0], args)
sys.exit (1)
Index: system-config-printer.glade
===================================================================
--- system-config-printer.glade (.../tags/0.7.74.4) (revision 1676)
+++ system-config-printer.glade (.../branches/0.7.74.x) (revision 1676)
@@ -183,7 +183,6 @@
<widget class="GtkToolbar" id="toolbar1">
<property name="visible">True</property>
<property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
- <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
<property name="tooltips">True</property>
<property name="show_arrow">True</property>
@@ -195,7 +194,7 @@
<property name="stock_id">gtk-new</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
- <property name="is_important">False</property>
+ <property name="is_important">True</property>
<signal name="clicked" handler="on_new_printer_activate" last_modification_time="Wed, 22 Feb 2006 15:25:39 GMT"/>
</widget>
<packing>
@@ -212,7 +211,7 @@
<property name="stock_id">gtk-new</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
- <property name="is_important">False</property>
+ <property name="is_important">True</property>
<signal name="clicked" handler="on_new_class_activate" last_modification_time="Wed, 22 Feb 2006 15:25:55 GMT"/>
</widget>
<packing>
@@ -227,7 +226,7 @@
<property name="stock_id">gtk-copy</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
- <property name="is_important">False</property>
+ <property name="is_important">True</property>
<signal name="clicked" handler="on_copy_activate" last_modification_time="Wed, 22 Feb 2006 15:26:11 GMT"/>
</widget>
<packing>
@@ -242,7 +241,7 @@
<property name="stock_id">gtk-delete</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
- <property name="is_important">False</property>
+ <property name="is_important">True</property>
<signal name="clicked" handler="on_delete_activate" last_modification_time="Wed, 22 Feb 2006 15:26:26 GMT"/>
</widget>
<packing>
Index: ChangeLog
===================================================================
--- ChangeLog (.../tags/0.7.74.4) (revision 1676)
+++ ChangeLog (.../branches/0.7.74.x) (revision 1676)
@@ -1,5 +1,40 @@
+2007-10-15 Tim Waugh <twaugh at redhat.com>
+
+ * Makefile.am (fix-glade): Remove toolbar_style property so as not
+ to over-ride the session preferences (Ubuntu #135844).
+
+ * applet.py (JobManager.__init__): Set text domain for Glade
+ (Ubuntu #149572).
+
+2007-10-05 Tim Waugh <twaugh at redhat.com>
+
+ * ppds.py (PPDs._findBestMatchPPDs): Efficiency improvement (don't
+ run lower() on the loop-constant string).
+ (PPDs._findBestMatchPPDs): The model search should be performed in
+ model order.
+
+2007-10-05 Till Kamppeter <till.kamppeter at gmail.com>
+
+ * ppds.py (_findBestMatchPPDs): Do case-insensitive match when
+ matching "most important" word. Especially important for matching
+ Canon printers (Ubuntu #149264).
+
+2007-10-05 Tim Waugh <twaugh at redhat.com>
+
+ * pysmb.py: More consistency and care in building command lines.
+
+2007-10-03 Till Kamppeter <till.kamppeter at gmail.com>
+
+ * my-default-printer.py: Corrected gettext domain (Ubuntu #147788).
+
2007-10-02 Tim Waugh <twaugh at redhat.com>
+ * system-config-printer.py (GUI.save_printer): Fetch server settings
+ if printer was saved. This allows us to update the 'not published'
+ label earlier.
+
+2007-10-02 Tim Waugh <twaugh at redhat.com>
+
* configure.in: Version 0.7.74.4.
2007-10-02 Tim Waugh <twaugh at redhat.com>
Index: ppds.py
===================================================================
--- ppds.py (.../tags/0.7.74.4) (revision 1676)
+++ ppds.py (.../branches/0.7.74.x) (revision 1676)
@@ -503,9 +503,10 @@
# field and look for a match based solely on that. If
# there are digits, try lowering the number of
# significant figures.
+ mdlnames.sort (cups.modelSort)
mdlitems = map (lambda x: (x.lower (), mdls[x]), mdlnames)
modelid = None
- for word in mdl.split (' '):
+ for word in mdll.split (' '):
if modelid == None:
modelid = word
@@ -547,7 +548,7 @@
for (name, ppds) in mdlitems:
for word in name.split (' '):
- if word == modelid:
+ if word.lower () == modelid:
found = True
break
Index: system-config-printer.py
===================================================================
--- system-config-printer.py (.../tags/0.7.74.4) (revision 1676)
+++ system-config-printer.py (.../branches/0.7.74.x) (revision 1676)
@@ -1392,6 +1392,16 @@
return True
self.changed = set() # of options
+ if not self.__dict__.has_key ("server_settings"):
+ # We can authenticate with the server correctly at this point,
+ # but we have never fetched the server settings to see whether
+ # the server is publishing shared printers. Fetch the settings
+ # now so that we can update the "not published" label if necessary.
+ try:
+ self.server_settings = self.cups.adminGetServerSettings()
+ except:
+ nonfatalException()
+
if class_deleted:
self.populateList ()
else:
Index: Makefile.am
===================================================================
--- Makefile.am (.../tags/0.7.74.4) (revision 1676)
+++ Makefile.am (.../branches/0.7.74.x) (revision 1676)
@@ -121,7 +121,7 @@
<(cd po; ls -1 *.po | sed -e "s,\.po$$,,")'
fix-glade:
- sed -i -e '/invisible_char/d' *.glade
+ sed -i -e '/invisible_char/d' -e '/toolbar_style/d' *.glade
run:
SYSTEM_CONFIG_PRINTER_GLADE=$(top_srcdir)/system-config-printer.glade \
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/sources,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- sources 19 Sep 2007 13:36:48 -0000 1.137
+++ sources 24 Oct 2007 10:05:43 -0000 1.138
@@ -1,2 +1,2 @@
20b18338b46531b1b28602deb44aa07d pycups-1.9.27.tar.bz2
-32e238af2a1e86478df541a407b973ee system-config-printer-0.7.63.4.tar.bz2
+a332f8598c0a4afcc72123856733e273 system-config-printer-0.7.74.4.tar.bz2
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/system-config-printer.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- system-config-printer.spec 19 Sep 2007 13:36:48 -0000 1.109
+++ system-config-printer.spec 24 Oct 2007 10:05:43 -0000 1.110
@@ -2,41 +2,50 @@
Summary: A printer administration tool
Name: system-config-printer
-Version: 0.7.63.4
+Version: 0.7.74.4
Release: 1%{?dist}
-License: GPL
+License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
Source0: system-config-printer-%{version}.tar.bz2
Source1: pycups-%{pycups_version}.tar.bz2
Source2: system-config-printer.pam
Source3: system-config-printer.console
+Patch0: system-config-printer-0.7.74.x.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
BuildRequires: desktop-file-utils >= 0.2.92
BuildRequires: gettext-devel
BuildRequires: intltool
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: xmlto
+BuildRequires: epydoc
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: pygtk2 >= 2.4.0, pygtk2-libglade
Requires: pygobject2
Requires: usermode >= 1.37
Requires: desktop-file-utils >= 0.2.92
-PreReq: system-config-printer-libs = %{version}-%{release}
+Requires: dbus-x11
+Requires: pirut
+Requires: system-config-printer-libs = %{version}-%{release}
+
+# The newprinternotification interface is an addition that hal-cups-utils
+# needs to be aware of.
+Conflicts: hal-cups-utils < 0.6.13
Obsoletes: system-config-printer-gui <= 0.6.152
+Provides: system-config-printer-gui = 0.6.152
%description
system-config-printer is a graphical user interface that allows
the user to configure a CUPS print server.
%package libs
-Summary: Common code for the graphical and non-graphical pieces.
+Summary: Common code for the graphical and non-graphical pieces
Group: System Environment/Base
-PreReq: python
+Requires: python
Requires: foomatic
-Requires: PyXML
Provides: pycups = %{pycups_version}
%description libs
@@ -45,31 +54,38 @@
%prep
%setup -q -a 1
+%patch0 -p0 -b .0.7.74.x
%build
%configure
pushd pycups-%{pycups_version}
make
+make doc
popd
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %buildroot
make DESTDIR=%buildroot install
pushd pycups-%{pycups_version}
+chmod 644 examples/cupstree.py
make DESTDIR=%buildroot install
popd
mkdir -p %buildroot%{_bindir}
mkdir -p %buildroot%{_sysconfdir}/pam.d
mkdir -p %buildroot%{_sysconfdir}/security/console.apps
-install -m0644 %{SOURCE2} %buildroot%{_sysconfdir}/pam.d/%{name}
-install -m0644 %{SOURCE3} %buildroot%{_sysconfdir}/security/console.apps/%{name}
+install -p -m0644 %{SOURCE2} %buildroot%{_sysconfdir}/pam.d/%{name}
+install -p -m0644 %{SOURCE3} %buildroot%{_sysconfdir}/security/console.apps/%{name}
ln -s consolehelper %buildroot%{_bindir}/%{name}
+chmod 755 %buildroot%{_datadir}/%{name}/cupsd.py
# The applet desktop file gets shipped by desktop-printing.
rm -f %buildroot%{_sysconfdir}/xdg/autostart/redhat-print-applet.desktop
+rm -f %buildroot%{_bindir}/my-default-printer
+rm -f %buildroot%{_datadir}/applications/redhat-my-default-printer.desktop
+rm -f %buildroot%{_datadir}/%{name}/my-default-printer.*
# Add 'SystemSetup' desktop-file category so that 'Printing' shows
# up in the System->Administration menu.
@@ -83,52 +99,50 @@
%find_lang system-config-printer
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %buildroot
%files libs -f system-config-printer.lang
-%defattr(-,root,root)
-%doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO}
+%defattr(-,root,root,-)
+%doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO,examples,html}
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/newprinternotification.conf
%{_libdir}/python*/*/*.so
%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/foomatic.py*
%{_datadir}/%{name}/cupshelpers.py*
-%{_datadir}/%{name}/gtk_html2pango.py*
%{_datadir}/%{name}/applet.glade
%{_datadir}/%{name}/applet.py*
%{_datadir}/%{name}/applet.png
+%{_datadir}/%{name}/inspecting-printer.png
+%{_datadir}/%{name}/ppds.py*
%files
-%defattr(-,root,root)
-%doc ChangeLog README NEWS TODO
+%defattr(-,root,root,-)
+%doc ChangeLog README TODO
%{_bindir}/%{name}
%{_bindir}/%{name}-applet
%{_sbindir}/%{name}
%{_datadir}/%{name}/config.py*
%{_datadir}/%{name}/cupsd.py*
-%{_datadir}/%{name}/nametree.py*
%{_datadir}/%{name}/options.py*
%{_datadir}/%{name}/optionwidgets.py*
%{_datadir}/%{name}/probe_printer.py*
%{_datadir}/%{name}/pysmb.py*
%{_datadir}/%{name}/system-config-printer.py*
%{_datadir}/%{name}/gtk_label_autowrap.py*
-%{_datadir}/%{name}/*.glade
+%{_datadir}/%{name}/system-config-printer.glade
%{_datadir}/applications/redhat-system-config-printer.desktop
%{_datadir}/applications/redhat-manage-print-jobs.desktop
-%{_sysconfdir}/pam.d/%{name}
-%{_sysconfdir}/security/console.apps/%{name}
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}
+%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
+%{_mandir}/man1/*
%post
/bin/rm -f /var/cache/foomatic/foomatic.pickle
-/usr/bin/update-desktop-database &>/dev/null ||:
exit 0
-%postun
-if [ "$1" = "0" ]; then
- /usr/bin/update-desktop-database &>/dev/null ||:
-fi
-
%changelog
+* Wed Oct 24 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.4-1
+- Updated to 0.7.74.4. Numerous changes.
+
* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 0.7.63.4-1
- Updated to pycups-1.9.27.
- 0.7.63.4:
More information about the fedora-extras-commits
mailing list