diff --git a/.gitignore b/.gitignore index 8729de5..cd2d946 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /cups-filters-1.0.30.tar.xz /cups-filters-1.0.31.tar.xz /cups-filters-1.0.32.tar.xz +/cups-filters-1.0.33.tar.xz diff --git a/cups-filters-1.0.32-null-info.patch b/cups-filters-1.0.32-null-info.patch deleted file mode 100644 index 13ce560..0000000 --- a/cups-filters-1.0.32-null-info.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -upr cups-filters-1.0.32_orig/utils/cups-browsed.c cups-filters-1.0.32_workk/utils/cups-browsed.c ---- cups-filters-1.0.32_orig/utils/cups-browsed.c 2013-04-04 13:41:34.839126301 +0200 -+++ cups-filters-1.0.32_work/utils/cups-browsed.c 2013-04-04 13:42:26.150339923 +0200 -@@ -698,7 +698,7 @@ void generate_local_queue(const char *ho - port, remote_queue); - - p = create_local_queue (local_queue_name, uri, remote_host, -- name, type, domain); -+ name ? name : "", type, domain); - free (uri); - } - -Only in cups-filters-1.0.32_workk/utils: .cups-browsed.c.swp -Only in cups-filters-1.0.32_workk/utils: tags diff --git a/cups-filters.spec b/cups-filters.spec index 308bc15..2baa21e 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -3,8 +3,8 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters -Version: 1.0.32 -Release: 2%{?dist} +Version: 1.0.33 +Release: 1%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -21,7 +21,6 @@ Group: System Environment/Base Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_as_standard_print_job_format Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz Source1: cups-browsed.service -Patch1: cups-filters-1.0.32-null-info.patch Requires: cups-filters-libs%{?_isa} = %{version}-%{release} @@ -89,7 +88,6 @@ This is the development package for OpenPrinting CUPS filters and backends. %prep %setup -q -%patch1 -p1 -b .null-info %build # work-around Rpath @@ -195,6 +193,10 @@ fi %{_libdir}/libfontembed.so %changelog +* Thu Apr 05 2013 Fridolin Pokorny - 1.0.33-1 +- 1.0.33 +- removed cups-filters-1.0.32-null-info.patch, accepted by upstream + * Thu Apr 04 2013 Fridolin Pokorny - 1.0.32-2 - fixed segfault when info is NULL diff --git a/sources b/sources index 4c6b5b8..bf55898 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1809e9187d4ae19b5f923093c3a8ac55 cups-filters-1.0.32.tar.xz +f125095f3d75fe5a4864461cd473267e cups-filters-1.0.33.tar.xz