system-config-printer:

- new upstream release
  - system-config-printer-1.3.2
  - pycups-1.9.55
  - pysmbc-1.0.10
- drop old patches (1,2,10)
- add Patch2,3 from fedora
  - Patch2: Improvements for check-device-ids from upstream.
  - Patch3: Fixed traceback in newprinter.py (bug #680683).
- update ja.po
- Patch21: add more ppd translation dictionary
- add BR: epydoc
	  


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3251 ec354946-7b23-47d6-9f5a-488ba84defc7

s/system-config-printer/system-config-printer-vl.spec

@@ -1,5 +1,5 @@
-%define pycups_version 1.9.48
-%define pysmbc_version 1.0.6
+%define pycups_version 1.9.55
+%define pysmbc_version 1.0.10
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
@@ -7,23 +7,24 @@
 Summary: A printer administration tool
 Summary(ja): プリンタ管理ツール
 Name: system-config-printer
-Version: 1.1.92
+Version: 1.3.2
 Release: 1%{?_dist_release}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 
-Source0: http://cyberelk.net/tim/data/system-config-printer/1.2/system-config-printer-%{version}.tar.bz2
+Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/system-config-printer-%{version}.tar.xz
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
-Source10: %{name}-1.1.92-ja.po
+Source10: %{name}-1.3.2-ja.po
 
-Patch1: system-config-printer-no-epydoc.patch
-Patch2: system-config-printer-lowercase-mfg-mdl.patch
-Patch10: system-config-printer-1.1.7-fix-adding-printer.patch
+#Patch1: system-config-printer-no-applet-in-gnome.patch
+Patch2: system-config-printer-check-device-ids.patch
+Patch3: system-config-printer-self.printers.patch
 
-Patch20: %{name}-1.1.92-gettext.patch
+Patch20: %{name}-1.3.2-gettext.patch
+Patch21: %{name}-1.3.2-ppd-translation.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -36,7 +37,7 @@ BuildRequires: intltool
 BuildRequires: xmlto
 BuildRequires: python-tools
 BuildRequires: libusb-devel, libudev-devel
-
+BuildRequires: epydoc
 
 Requires: pygtk2
 Requires: pygobject
@@ -87,11 +88,17 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 
-%patch1 -p1 -b .no-epydoc
-%patch2 -p1 -b .lowercase-mfg-mdl
-%patch10 -p1
-%patch20 -p1
+# Don't start the applet in GNOME.
+#%patch1 -p1 -b .no-applet-in-gnome
+
+# Improvements for check-device-ids from upstream.
+%patch2 -p1 -b .check-device-ids
+
+# Fixed traceback in newprinter.py (bug #680683).
+%patch3 -p1 -b .self.printers
 
+%patch20 -p1 -b .gettext
+%patch21 -p1 -b .ppd-translation
 
 cp -f %{SOURCE10} po/ja.po
 
@@ -110,7 +117,9 @@ popd
 
 %install
 rm -rf %buildroot
-make DESTDIR=%buildroot install
+make DESTDIR=%buildroot install \
+     udevrulesdir=/lib/udev/rules.d \
+     udevhelperdir=/lib/udev
 
 pushd pycups-%{pycups_version}
 make DESTDIR=%buildroot install
@@ -136,17 +145,18 @@ exit 0
 %defattr(-,root,root,-)
 %doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO,examples,html}
 %doc --parents pysmbc-%{pysmbc_version}/{ChangeLog,README,NEWS,TODO,test.py,html}
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/newprinternotification.conf
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/printerdriversinstaller.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
+%dir %{_sysconfdir}/cupshelpers
+%config(noreplace) %{_sysconfdir}/cupshelpers/preferreddrivers.xml
 %{python_sitearch}/cups.so
 %{python_sitearch}/smbc.so
 %{python_sitearch}/*.egg-info
 %dir %{python_sitelib}/cupshelpers
-%{python_sitelib}/cupshelpers/__init__.py*
-%{python_sitelib}/cupshelpers/cupshelpers.py*
-%{python_sitelib}/cupshelpers/openprinting.py*
-%{python_sitelib}/cupshelpers/ppds.py*
+%{python_sitelib}/cupshelpers/*.py*
 %{python_sitelib}/*.egg-info
+%{_rpmconfigdir}/fileattrs/psdriver.attr
+%{_rpmconfigdir}/postscriptdriver.prov
 
 %files udev
 %defattr(-,root,root,-)
@@ -160,17 +170,36 @@ exit 0
 %doc ChangeLog README
 %{_bindir}/%{name}
 %{_bindir}/%{name}-applet
+%{_bindir}/scp-dbus-service
+%{_datadir}/dbus-1/interfaces/*.xml
+%{_datadir}/dbus-1/services/*.service
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.py*
 %{_datadir}/%{name}/troubleshoot
 %{_datadir}/%{name}/icons
+%dir %{_datadir}/%{name}/xml
+%{_datadir}/%{name}/xml/*.rng
+%{_datadir}/%{name}/xml/*.py*
+%dir %{_datadir}/%{name}/ui
 %{_datadir}/%{name}/ui/*.glade
 %{_datadir}/applications/system-config-printer.desktop
-%{_datadir}/applications/manage-print-jobs.desktop
 %{_sysconfdir}/xdg/autostart/print-applet.desktop
 %{_mandir}/man1/*
 
 %changelog
+* Sat Apr 02 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.2-1
+- new upstream release
+  - system-config-printer-1.3.2
+  - pycups-1.9.55
+  - pysmbc-1.0.10
+- drop old patches (1,2,10)
+- add Patch2,3 from fedora
+  - Patch2: Improvements for check-device-ids from upstream.
+  - Patch3: Fixed traceback in newprinter.py (bug #680683).
+- update ja.po
+- Patch21: add more ppd translation dictionary
+- add BR: epydoc
+
 * Mon Feb 22 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.1.92-1
 - new development release (pre1.2)
   - system-config-printer-1.1.92