upgrading package: wx 2.4.2 -> 2.5.4

wx/wx.patch

@@ -0,0 +1,12 @@
+Index: Makefile.in
+--- Makefile.in.orig	2004-10-10 17:17:27 +0200
++++ Makefile.in	2005-02-24 22:26:54 +0100
+@@ -7894,7 +7894,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale

wx/wx.spec

@@ -33,11 +33,12 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        XWindow
 License:      LGPL
-Version:      2.4.2
-Release:      20040920
+Version:      2.5.4
+Release:      20050225
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-%{version}.tar.bz2
+Patch0:       wx.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -57,11 +58,12 @@ AutoReqProv:  no
     prog wx = {
         version   = %{version}
         url       = http://prdownloads.sourceforge.net/wxwindows/
-        regex     = wxGTK-(\d+\.[02468]\.\d+)\.tar\.bz2
+        regex     = wxGTK-(\d+\.\d+\.\d+)\.tar\.bz2
     }
 
 %prep
     %setup -q -n wxGTK-%{version}
+    %patch -p0
 
 %build
     #   configure package
@@ -71,6 +73,7 @@ AutoReqProv:  no
     CXXFLAGS="%{l_cxxflags -O}" \
     CPPFLAGS="-I`pwd`/contrib/include %{l_cppflags tiff}" \
     LDFLAGS="%{l_ldflags}" \
+    LN_S="ln" \
     ./configure \
         --prefix=%{l_prefix} \
         --with-x \
@@ -97,14 +100,10 @@ AutoReqProv:  no
 %install
     #   install package
     rm -rf $RPM_BUILD_ROOT
-    %{l_make} %{l_mflags} install \
-        prefix=$RPM_BUILD_ROOT%{l_prefix} \
-        exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
+    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
     for contrib in xrc stc; do
         ( cd contrib/src/$contrib
-          %{l_make} %{l_mflags} install \
-              prefix=$RPM_BUILD_ROOT%{l_prefix} \
-              exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
+          %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
         ) || exit $?
     done