rpms/system-config-printer/F-9 .cvsignore, 1.167, 1.168 sources, 1.174, 1.175 system-config-printer.spec, 1.191, 1.192

Wed Oct 1 17:04:35 UTC 2008

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28355

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Wed Oct  1 2008 Tim Waugh <twaugh at redhat.com> 1.0.8-1
- 1.0.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/.cvsignore,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168

--- .cvsignore	30 Jun 2008 14:42:09 -0000	1.167
+++ .cvsignore	1 Oct 2008 17:04:05 -0000	1.168
@@ -163,3 +163,6 @@
 system-config-printer-0.7.82.4.tar.bz2
 pycups-1.9.40.tar.bz2
 system-config-printer-0.7.82.5.tar.bz2
+system-config-printer-1.0.8.tar.bz2
+pysmbc-1.0.5.tar.bz2
+pycups-1.9.42.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/sources,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- sources	30 Jun 2008 14:42:09 -0000	1.174
+++ sources	1 Oct 2008 17:04:05 -0000	1.175
@@ -1,2 +1,3 @@
-ea0a35e578c0f4acff75e30ecbe704cb  pycups-1.9.40.tar.bz2
-4c2f7ac09f4958d2b876aac4f5eaf5aa  system-config-printer-0.7.82.5.tar.bz2
+7cd1662e1ee658cd7815b1732c7fc604  system-config-printer-1.0.8.tar.bz2
+fb77befa25ad919f532e24ea8f9cdd36  pysmbc-1.0.5.tar.bz2
+030379d4accc18c402cd1ec367524a3b  pycups-1.9.42.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- system-config-printer.spec	30 Jun 2008 14:42:09 -0000	1.191
+++ system-config-printer.spec	1 Oct 2008 17:04:05 -0000	1.192
@@ -1,28 +1,28 @@
-%define pycups_version 1.9.40
+%define pycups_version 1.9.42
+%define pysmbc_version 1.0.5
+%{!?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]")}
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.82.5
+Version: 1.0.8
 Release: 1%{?dist}
 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
+Source0: http://cyberelk.net/tim/data/system-config-printer/1.0.x/system-config-printer-%{version}.tar.bz2
+Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
+Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
+BuildRequires: libsmbclient-devel >= 3.2
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: gettext-devel
 BuildRequires: intltool
 BuildRequires: xmlto
 BuildRequires: epydoc
-
-# For 'make check':
-BuildRequires: foomatic, gutenprint-cups
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: pygtk2 >= 2.4.0, pygtk2-libglade
@@ -47,18 +47,19 @@
 the user to configure a CUPS print server.
 
 %package libs
-Summary: Common code for the graphical and non-graphical pieces
+Summary: Libraries and shared code for printer administration tool
 Group: System Environment/Base
 Requires: python
 Requires: foomatic
 Provides: pycups = %{pycups_version}
+Provides: pysmbc = %{pysmbc_version}
 
 %description libs
 The common code used by both the graphical and non-graphical parts of
 the configuration tool.
 
 %prep
-%setup -q -a 1
+%setup -q -a 1 -a 2
 
 %build
 %configure
@@ -68,12 +69,20 @@
 make doc
 popd
 
+pushd pysmbc-%{pysmbc_version}
+make
+make doc
+popd
+
 %install
 rm -rf %buildroot
 make DESTDIR=%buildroot install
 
 pushd pycups-%{pycups_version}
-chmod 644 examples/cupstree.py
+make DESTDIR=%buildroot install
+popd
+
+pushd pysmbc-%{pysmbc_version}
 make DESTDIR=%buildroot install
 popd
 
@@ -85,36 +94,50 @@
 %files libs -f system-config-printer.lang
 %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
 %{python_sitearch}/cups.so
 %{python_sitearch}/cups-1.0-py%{pyver}.egg-info
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/cupshelpers.py*
-%{_datadir}/%{name}/debug.py*
-%{_datadir}/%{name}/ppds.py*
+%{python_sitearch}/smbc.so
+%{python_sitearch}/smbc-1.0-py%{pyver}.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}/*.egg-info
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README TODO
+%doc ChangeLog README
 %{_bindir}/%{name}
 %{_bindir}/%{name}-applet
 %{_bindir}/my-default-printer
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/AdvancedServerSettings.py*
 %{_datadir}/%{name}/authconn.py*
 %{_datadir}/%{name}/config.py*
+%{_datadir}/%{name}/contextmenu.py*
+%{_datadir}/%{name}/debug.py*
+%{_datadir}/%{name}/errordialogs.py*
+%{_datadir}/%{name}/jobviewer.py*
+%{_datadir}/%{name}/monitor.py*
 %{_datadir}/%{name}/my-default-printer.py*
-%{_datadir}/%{name}/openprinting.py*
 %{_datadir}/%{name}/options.py*
 %{_datadir}/%{name}/optionwidgets.py*
+%{_datadir}/%{name}/PhysicalDevice.py*
 %{_datadir}/%{name}/probe_printer.py*
 %{_datadir}/%{name}/pysmb.py*
 %{_datadir}/%{name}/smburi.py*
-%{_datadir}/%{name}/system-config-printer.py*
 %{_datadir}/%{name}/statereason.py*
+%{_datadir}/%{name}/system-config-printer.py*
+%{_datadir}/%{name}/userdefault.py*
 %{_datadir}/%{name}/gtk_label_autowrap.py*
 %{_datadir}/%{name}/gtk_treeviewtooltips.py*
 %{_datadir}/%{name}/applet.py*
 %{_datadir}/%{name}/troubleshoot
 %{_datadir}/%{name}/*.glade
+%{_datadir}/%{name}/icons
 %{_datadir}/applications/redhat-system-config-printer.desktop
 %{_datadir}/applications/redhat-manage-print-jobs.desktop
 %{_datadir}/applications/redhat-my-default-printer.desktop
@@ -126,6 +149,9 @@
 exit 0
 
 %changelog
+* Wed Oct  1 2008 Tim Waugh <twaugh at redhat.com> 1.0.8-1
+- 1.0.8.
+
 * Mon Jun 30 2008 Tim Waugh <twaugh at redhat.com> 0.7.82.5-1
 - 0.7.82.5:
   - Fixed traceback in troubleshooter.


