diff --git a/.cvsignore b/.cvsignore index d3d275a..bbde60b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgsf-1.14.11.tar.bz2 +libgsf-1.14.12.tar.bz2 diff --git a/libgsf-1.14.11.gcc39015.patch b/libgsf-1.14.11.gcc39015.patch deleted file mode 100644 index 31f9bd4..0000000 --- a/libgsf-1.14.11.gcc39015.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru libgsf-1.14.11.orig/gsf/gsf-output-csv.c libgsf-1.14.11/gsf/gsf-output-csv.c ---- libgsf-1.14.11.orig/gsf/gsf-output-csv.c 2009-01-30 11:51:12.000000000 +0000 -+++ libgsf-1.14.11/gsf/gsf-output-csv.c 2009-01-30 11:51:33.000000000 +0000 -@@ -182,7 +182,7 @@ - static GType gsf_output_csv_quoting_mode_type = 0; - - if (gsf_output_csv_quoting_mode_type == 0) { -- GEnumValue const values[] = { -+ static GEnumValue const values[] = { - { GSF_OUTPUT_CSV_QUOTING_MODE_NEVER, (char *)"GSF_OUTPUT_CSV_QUOTING_MODE_NEVER", (char *)"never" }, - { GSF_OUTPUT_CSV_QUOTING_MODE_AUTO, (char *)"GSF_OUTPUT_CSV_QUOTING_MODE_AUTO", (char *)"auto" }, - { GSF_OUTPUT_CSV_QUOTING_MODE_ALWAYS, (char *)"GSF_OUTPUT_CSV_QUOTING_MODE_ALWAYS", (char *)"always" }, diff --git a/libgsf.spec b/libgsf.spec index ab92935..6cba317 100644 --- a/libgsf.spec +++ b/libgsf.spec @@ -3,8 +3,8 @@ Summary: GNOME Structured File library Name: libgsf -Version: 1.14.11 -Release: 3%{?dist} +Version: 1.14.12 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2 @@ -17,8 +17,6 @@ Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 -Patch0: libgsf-1.14.11.gcc39015.patch - %description A library for reading and writing structured files (eg MS OLE and Zip) @@ -59,7 +57,6 @@ Python bindings for libgsf %prep %setup -q -%patch0 -p1 -b .gcc39015 %build %configure --disable-gtk-doc --disable-static @@ -135,6 +132,9 @@ fi rm -r $RPM_BUILD_ROOT %changelog +* Wed Apr 29 2009 Caolán McNamara 1.14.12-1 +- latest version, drop integrated libgsf-1.14.11.gcc39015.patch + * Wed Feb 25 2009 Fedora Release Engineering - 1.14.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 33cf378..4165b19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86bec0012435fbafe02a6e4c88bdf9ba libgsf-1.14.11.tar.bz2 +dc7534e8f80775ab157779cc3b3c84f1 libgsf-1.14.12.tar.bz2