diff --git a/.cvsignore b/.cvsignore index 2a609a1..209c236 100644 --- a/.cvsignore +++ b/.cvsignore @@ -167,3 +167,4 @@ system-config-printer-0.9.91.tar.bz2 pysmbc-1.0.2.tar.bz2 system-config-printer-0.9.92.tar.bz2 system-config-printer-0.9.93.tar.bz2 +system-config-printer-1.0.0.tar.bz2 diff --git a/sources b/sources index 90a1bca..776fb47 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ cf3a3db3f1ff08bdf2c9254086e8ec70 pycups-1.9.38.tar.bz2 5e82fb70ead0d00f2ec8979b44269982 pysmbc-1.0.2.tar.bz2 -b97deae648bc1c5825874d250a9c140c system-config-printer-0.9.93.tar.bz2 +8a24d4212f97f4bbcc4b8ae55d275d1b system-config-printer-1.0.0.tar.bz2 diff --git a/system-config-printer-0.9.93.tar.bz2.sig b/system-config-printer-0.9.93.tar.bz2.sig deleted file mode 100644 index 53a1c15..0000000 Binary files a/system-config-printer-0.9.93.tar.bz2.sig and /dev/null differ diff --git a/system-config-printer-1.0.0.tar.bz2.sig b/system-config-printer-1.0.0.tar.bz2.sig new file mode 100644 index 0000000..f33381f Binary files /dev/null and b/system-config-printer-1.0.0.tar.bz2.sig differ diff --git a/system-config-printer-scanning.patch b/system-config-printer-scanning.patch deleted file mode 100644 index 3288834..0000000 --- a/system-config-printer-scanning.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 13c584b417496be4a99560a71bf0950cf9ec5269 Mon Sep 17 00:00:00 2001 -From: Tim Waugh -Date: Fri, 23 May 2008 16:17:03 +0100 -Subject: [PATCH] Removed Scanning... label when SMB browsing shows no workgroups. - ---- - ChangeLog | 4 ++++ - system-config-printer.py | 2 +- - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 9b10f43..3d7c547 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,9 @@ - 2008-05-23 Tim Waugh - -+ * system-config-printer.py -+ (NewPrinterGUI.browse_smb_hosts_thread): Remove the 'Scanning...' -+ label when browsing is unsuccessful. -+ - * configure.in: Version 0.9.93. - - 2008-05-23 Tim Waugh -diff --git a/system-config-printer.py b/system-config-printer.py -index a793ef1..6564de8 100755 ---- a/system-config-printer.py -+++ b/system-config-printer.py -@@ -3355,8 +3355,8 @@ class NewPrinterGUI(GtkGUI): - store.set_value (iter, 0, d['DOMAIN']) - store.set_value (iter, 2, d) - else: -+ store.clear () - if workgroups: -- store.clear () - for workgroup in workgroups: - iter = store.append (None, [workgroup]) - i = store.append (iter) --- -1.5.4.3 - diff --git a/system-config-printer.spec b/system-config-printer.spec index dbf8b5a..3aa3a15 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -5,19 +5,18 @@ Summary: A printer administration tool Name: system-config-printer -Version: 0.9.93 -Release: 2%{?dist} +Version: 1.0.0 +Release: 1%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base -Source0: http://cyberelk.net/tim/data/system-config-printer/system-config-printer-%{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 -Patch1: system-config-printer-scanning.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 -BuildRequires: libsmbclient-devel >= 2.4 +BuildRequires: libsmbclient-devel >= 3.2 BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: gettext-devel BuildRequires: intltool @@ -59,7 +58,6 @@ the configuration tool. %prep %setup -q -a 1 -a 2 -%patch1 -p1 -b .scanning %build %configure @@ -143,6 +141,9 @@ rm -rf %buildroot exit 0 %changelog +* Tue May 27 2008 Tim Waugh 1.0.0-1 +- 1.0.0. + * Fri May 23 2008 Tim Waugh 0.9.93-2 - Fixed small UI problem in SMB browser.