From edf4a7a1bdd79392e7553ec09ea5fb5c2e4db7c0 Mon Sep 17 00:00:00 2001 From: ZC Miao Date: Nov 24 2007 15:33:39 +0000 Subject: update to 0.6.1 --- diff --git a/.cvsignore b/.cvsignore index df93bf1..2826b27 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ wxGlade-0.5.tar.gz +wxGlade-0.6.1.tar.gz diff --git a/sources b/sources index e0d1064..40500e4 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 705855ef251053bd6b032bc5667cea19 wxGlade-0.5.tar.gz +2594cbbe6609119b803c1e0d38ad9289 wxGlade-0.6.1.tar.gz diff --git a/wxGlade.spec b/wxGlade.spec index f9888c7..88bfe85 100644 --- a/wxGlade.spec +++ b/wxGlade.spec @@ -1,7 +1,7 @@ Summary: A wxWidgets/wxPython/wxPerl GUI designer Name: wxGlade -Version: 0.5 -Release: 6%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Source0: http://downloads.sourceforge.net/wxglade/%{name}-%{version}.tar.gz Source1: wxglade.desktop Source2: wxglade.png @@ -14,9 +14,6 @@ BuildRequires: desktop-file-utils Requires: python >= 2.2 Requires: wxPython >= 2.6 -# bug 248795 -Patch10: wxglade-0.5-docs_path.patch - %description wxGlade is a GUI designer written in Python with the popular GUI toolkit wxPython, that helps you create wxWidgets/wxPython user @@ -25,7 +22,6 @@ interfaces. At the moment it can generate Python, C++, Perl and XRC %prep %setup -q -%patch10 -p0 -b .docs_path %build @@ -67,6 +63,9 @@ desktop-file-install --vendor=fedora \ install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps +# docs symlink +ln -s %{_docdir}/%{name}-%{version}/docs $RPM_BUILD_ROOT%{_datadir}/%{name}/docs + %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : @@ -90,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 24 2007 ZC Miao - 0.6.1-1 +- update to 0.6.1 +- remove docs path patch, add a docs symlink instead + * Thu Jul 19 2007 ZC Miao - 0.5-6 - 248795 , patch for launch help docs correctly diff --git a/wxglade-0.5-docs_path.patch b/wxglade-0.5-docs_path.patch deleted file mode 100644 index d29705d..0000000 --- a/wxglade-0.5-docs_path.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- common.py.orig 2007-07-18 23:30:33.000000000 +0300 -+++ common.py 2007-07-18 23:32:34.000000000 +0300 -@@ -16,6 +16,9 @@ - # program path, set in wxglade.py - wxglade_path = '.' - -+# documentation path -+wxglade_docs_path = '/usr/share/doc/wxGlade-0.5' -+ - # widgets dictionary: each key is the name of some EditWidget class; the mapped - # value is a 'factory' function which actually builds the object. Each of these - # functions accept 3 parameters: the parent of the widget, the sizer by which ---- main.py.orig 2007-07-18 23:00:16.000000000 +0300 -+++ main.py 2007-07-18 23:30:57.000000000 +0300 -@@ -780,7 +780,7 @@ - self.about_box.ShowModal() - - def show_tutorial(self, event): -- docs_path = os.path.join(common.wxglade_path, 'docs', 'index.html') -+ docs_path = os.path.join(common.wxglade_docs_path, 'docs', 'index.html') - if wx.Platform == "__WXMAC__": - os.system('open -a Help\ Viewer.app %s' % docs_path) - else: