X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92b3d078ac420dab4149136481c19540aa87aacc..dc6588e771dc7180a69841a1b5ec29b4e5ea73d0:/wxGTK_RR.spec

diff --git a/wxGTK_RR.spec b/wxGTK_RR.spec
index 335f67f9e7..904896be43 100644
--- a/wxGTK_RR.spec
+++ b/wxGTK_RR.spec
@@ -1,5 +1,5 @@
 %define _prefix /opt/gnome
-%define ver  2.6.0
+%define ver  2.6.2
 %define ver2 2.6
 %define rel  1
 
@@ -19,7 +19,7 @@
 %if %{unicode}
     %define buildname gtk2u
 %else
-    %define buildname gtk2u
+    %define buildname gtk2
 %endif
 %else
     %define gtkver 1.2
@@ -33,7 +33,7 @@
     %define wxconfigstatic	%{portname}-unicode-release-static-%{ver2}
     %define wxconfiglink	wx%{portname}u-%{ver2}-config
 %else
-    %define name		wx-%{portname}
+    %define name		wx-%{portname}-ansi
     %define wxconfig		%{portname}-ansi-release-%{ver2}
     %define wxconfigstatic	%{portname}-ansi-release-static-%{ver2}
     %define wxconfiglink	wx%{portname}-%{ver2}-config
@@ -82,6 +82,13 @@ wxWidgets is a free C++ library for cross-platform GUI development.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
+%package -n wx-i18n
+Summary: The translations for the wxWidgets library.
+Group: X11/Libraries
+
+%description -n wx-i18n
+The translations files for the wxWidgets library.
+
 %package devel
 Summary: The GTK+ %{gtkver} port of the wxWidgets library
 Group: X11/Libraries
@@ -112,7 +119,7 @@ lists, arrays), portable wrappers around many OS-specific funstions (file
 operations, time/date manipulations, threads, processes, sockets, shared
 library loading) as well as other utility classes (streams, archive and
 compression). wxBase currently supports Win32, most Unix variants (Linux, 
-FreeBSD, Solaris, HP-UX) and MacOS X 10.3.
+FreeBSD, Solaris, HP-UX) and MacOS X (Carbon and Mach-0).
 
 %package -n %{wxbasename}-devel
 Summary: wxBase library, header files.
@@ -154,7 +161,6 @@ mkdir obj-shared-no-gui
 cd obj-shared-no-gui
 ../configure --prefix=%{_prefix} \
 			      --disable-gui \
-			      --disable-optimise \
 %if %{unicode}
                               --enable-unicode
 %else
@@ -167,15 +173,15 @@ mkdir obj-shared
 cd obj-shared
 ../configure --prefix=%{_prefix} \
 %if ! %{gtk2}
-			      --with-gtk1 \
+			      --with-gtk=1 \
 %else
-			      --with-gtk2 \
+			      --with-gtk=2 \
 %endif
-			      --disable-optimise \
 %if %{unicode}
 			      --enable-unicode \
 %else
 			      --disable-unicode \
+			      --with-odbc \
 %endif
 			      --with-opengl
 $MAKE
@@ -189,7 +195,6 @@ cd obj-static-no-gui
 ../configure --prefix=%{_prefix} \
 			      --disable-gui \
       			      --disable-shared \
-			      --disable-optimise \
 %if %{unicode}
                               --enable-unicode
 %else
@@ -202,16 +207,16 @@ mkdir obj-static
 cd obj-static
 ../configure --prefix=%{_prefix} \
 %if ! %{gtk2}
-			      --with-gtk1 \
+			      --with-gtk=1 \
 %else
-			      --with-gtk2 \
+			      --with-gtk=2 \
 %endif
 			      --disable-shared \
-			      --disable-optimise \
 %if %{unicode}
                 	      --enable-unicode \
 %else
             		      --disable-unicode \
+			      --with-odbc \
 %endif
             		      --with-opengl
 $MAKE
@@ -224,7 +229,7 @@ cd ../../..
 rm -rf $RPM_BUILD_ROOT
 (cd obj-static-no-gui; make DESTDIR=$RPM_BUILD_ROOT install)
 (cd obj-static; make DESTDIR=$RPM_BUILD_ROOT install)
-(cd obj-shared-no-gui; DESTDIR=$RPM_BUILD_ROOT install)
+(cd obj-shared-no-gui; make DESTDIR=$RPM_BUILD_ROOT install)
 (cd obj-shared; make DESTDIR=$RPM_BUILD_ROOT install)
 
 # --- wxBase headers list begins here ---
@@ -245,7 +250,6 @@ wx/confbase.h
 wx/config.h
 wx/containr.h
 wx/datetime.h
-wx/datetime.inl
 wx/datstrm.h
 wx/dde.h
 wx/debug.h
@@ -529,13 +533,9 @@ ln -sf %{_libdir}/wx/config/%{wxconfig} %{_bindir}/%{wxconfiglink}
 /sbin/ldconfig
 
 %preun devel
-if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
-    SUM1=`md5sum %{_libdir}/wx/config/%{wxconfig} | cut -c 0-32`
-    SUM2=`md5sum %{_bindir}/wx-config | cut -c 0-32`
-    if test "x$SUM1" = "x$SUM2" ; then
-        rm -f %{_bindir}/wx-config
-    fi
-fi
+%if %{unicode}
+    rm -f %{_bindir}/wx-config
+%endif
 rm -f %{_bindir}/%{wxconfiglink}
 
 %post -n %{wxbasename}
@@ -586,6 +586,9 @@ rm -f %{_bindir}/%{wxbaseconfiglink}
 %{_libdir}/libwx_%{buildname}_qa-%{ver2}.so.*
 %{_libdir}/libwx_%{buildname}_xrc-%{ver2}.so.*
 
+%files -n wx-i18n
+%defattr(-,root,root)
+%{_datadir}/locale/*/*/*
 
 %files devel -f core-headers.files
 %defattr(-,root,root)
@@ -621,7 +624,6 @@ rm -f %{_bindir}/%{wxbaseconfiglink}
 %files -n %{wxbasename}
 %defattr(-,root,root)
 %{_libdir}/libwx_base*-%{ver2}.so.*
-#%{_datadir}/locale/*/*/*
 
 %files -n %{wxbasename}-devel -f wxbase-headers.paths
 %defattr (-,root,root)