rpms/system-config-printer/devel pycups-threads.patch, NONE, 1.1 system-config-printer.spec, NONE, 1.1 Makefile, 1.1, 1.2 sources, 1.59, 1.60 printconf.spec, 1.62, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 12 21:09:59 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6954
Modified Files:
Makefile sources
Added Files:
pycups-threads.patch system-config-printer.spec
Removed Files:
printconf.spec
Log Message:
New code base.
pycups-threads.patch:
ChangeLog | 5 +++++
cupsconnection.c | 3 +++
2 files changed, 8 insertions(+)
--- NEW FILE pycups-threads.patch ---
--- pycups-1.9.6/cupsconnection.c.threads 2006-04-03 11:53:05.000000000 +0100
+++ pycups-1.9.6/cupsconnection.c 2006-04-07 12:21:48.000000000 +0100
@@ -80,9 +80,12 @@
if (!PyArg_ParseTupleAndKeywords (args, kwds, "", kwlist))
return -1;
+ Py_BEGIN_ALLOW_THREADS;
self->http = httpConnectEncrypt (cupsServer (),
ippPort (),
cupsEncryption ());
+ Py_END_ALLOW_THREADS;
+
if (!self->http) {
PyErr_SetString (PyExc_RuntimeError, "httpConnectionEncrypt failed");
return -1;
--- pycups-1.9.6/ChangeLog.threads 2006-04-04 17:26:35.000000000 +0100
+++ pycups-1.9.6/ChangeLog 2006-04-07 12:21:48.000000000 +0100
@@ -0,0 +1,5 @@
+2006-04-07 Tim Waugh <twaugh at redhat.com>
+
+ * cupsconnection.c (Connection_init): Allow threads during
+ httpConnectEncrypt().
+
--- NEW FILE system-config-printer.spec ---
%define pycups_version 1.9.6
Summary: A printer administration tool
Name: system-config-printer
Version: 0.7.3
Release: 1
License: GPL
Group: System Environment/Base
Source0: system-config-printer-%{version}.tar.bz2
Source1: pycups-%{pycups_version}.tar.bz2
Patch0: pycups-threads.patch
%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
BuildRequires: cups-devel, python-devel
PreReq: python, python-abi = %{pyver}
PreReq: rhpl >= 0.81
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: pygtk2 >= 2.4.0, pygtk2-libglade
%description
system-config-mouse is a graphical user interface that allows
the user to configure a CUPS print server.
%prep
%setup -q -a 1
pushd pycups-%{pycups_version}
%patch0 -p1 -b .threads
popd
%build
pushd pycups-%{pycups_version}
make
popd
%install
rm -rf $RPM_BUILD_ROOT
pushd pycups-%{pycups_version}
make install DESTDIR=%buildroot
popd
mkdir -p %buildroot%{_datadir}/%{name}
mkdir -p %buildroot%{_bindir}
install -m0644 *.py %buildroot%{_datadir}/%{name}/
install -m0644 *.glade %buildroot%{_datadir}/%{name}/
chmod 755 %buildroot%{_datadir}/%{name}/%{name}.py
install -m0755 %{name} %buildroot%{_bindir}/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO}
%doc ChangeLog README NEWS TODO
%{_libdir}/python*/*/*.so
%{_bindir}/%{name}
%{_datadir}/%{name}
%changelog
* Fri Apr 7 2006 Tim Waugh <twaugh at redhat.com> 0.7.3-1
- Added threads patch from pycups CVS.
- Updated to system-config-printer-0.7.3.
* Tue Apr 4 2006 Tim Waugh <twaugh at redhat.com>
- Updated to pycups-1.9.6.
* Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com>
- Updated to pycups-1.9.5.
* Fri Mar 17 2006 Tim Waugh <twaugh at redhat.com>
- Package the actual system-config-printer command.
* Thu Mar 16 2006 Tim Waugh <twaugh at redhat.com> 0.7.1-1
- Include s-c-printer tarball.
- Updated to pycups-1.9.4.
* Wed Mar 15 2006 Tim Waugh <twaugh at redhat.com> 0.7.0-1
- Initial spec file.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources 14 Feb 2006 12:56:40 -0000 1.59
+++ sources 12 Apr 2006 21:09:45 -0000 1.60
@@ -1 +1,2 @@
-845ddb531b137b91a39f40070f6cf305 printconf-0.6.151.tar.bz2
+da787f94813be62db0ed29c51da7839e pycups-1.9.6.tar.bz2
+854de918e3cf8201f98e54d314cd0ef1 system-config-printer-0.7.3.tar.bz2
--- printconf.spec DELETED ---
More information about the fedora-cvs-commits
mailing list