From 38b6cc368e28ffcd9061a42128a58a253b562587 Mon Sep 17 00:00:00 2001 From: pertusus Date: Feb 29 2008 23:15:33 +0000 Subject: - update to 1.14. Remove upstreamed gcc 4.3 patch --- diff --git a/.cvsignore b/.cvsignore index 6f2cd40..cb2c445 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xchm-1.13.tar.gz +xchm-1.14.tar.gz diff --git a/sources b/sources index fc6f29a..010601b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b444e36d6f1c7b3d772d1986ea9929dc xchm-1.13.tar.gz +0f398af788a9e1a7c6f4e65b5ca31cf3 xchm-1.14.tar.gz diff --git a/xchm-1.13-gcc43.patch b/xchm-1.13-gcc43.patch deleted file mode 100644 index 9ddb5f0..0000000 --- a/xchm-1.13-gcc43.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xchm-1.13/src/chmfile.h.gcc43 xchm-1.13/src/chmfile.h ---- xchm-1.13/src/chmfile.h.gcc43 2008-01-04 22:16:58.000000000 +0100 -+++ xchm-1.13/src/chmfile.h 2008-01-04 22:18:51.000000000 +0100 -@@ -278,7 +278,7 @@ private: - //! Retrieve the data (name/URL) for a single entry (TOC or index) - bool GetItem(UCharPtr& topics, UCharPtr& strings, UCharPtr& urltbl, - UCharPtr& urlstr, u_int32_t index, wxTreeCtrl *toBuild, -- CHMListCtrl* toBuild, const wxString& idxName, -+ CHMListCtrl* toBuildList, const wxString& idxName, - const wxCSConv& cv, int level, bool local); - - //! Get the binary index (if available) diff --git a/xchm.spec b/xchm.spec index f8c3bf6..31e1018 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,12 +1,11 @@ Summary: A GUI front-end to CHMlib Name: xchm -Version: 1.13 -Release: 3%{?dist} +Version: 1.14 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Publishing Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop -Patch0: xchm-1.13-gcc43.patch URL: http://xchm.sourceforge.net/ BuildRequires: chmlib-devel BuildRequires: wxGTK-devel >= 2.6 @@ -24,7 +23,6 @@ content or just the topics' titles. %prep %setup -q -%patch0 -p1 -b .gcc43 %build %configure --disable-dependency-tracking @@ -68,8 +66,8 @@ update-desktop-database &> /dev/null ||: %{_datadir}/applications/* %changelog -* Tue Feb 19 2008 Fedora Release Engineering - 1.13-3 -- Autorebuild for GCC 4.3 +* Sat Mar 1 2008 Patrice Dumas 1.14-1 +- update to 1.14. Remove upstreamed gcc 4.3 patch * Sat Jan 5 2008 Patrice Dumas 1.13-2 - fixes for gcc 4.3