Correct decoding of 4-byte integers in png2c script.

[wxWidgets.git] / wxBase.spec

diff --git a/wxBase.spec b/wxBase.spec
index c25ce9ccec4ac67ea075224b6c81091bc148d698..6da52b156b3253b4ba71e5bbbf1d2d408786709e 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,7 +1,7 @@
 %define pref /usr
 %define pref /usr

-%define ver 2.5.2
-%define ver2 2.5
-%define rel 1
+%define ver  2.9.2
+%define ver2 2.9
+%define rel  1

 
 # Configurable settings (use --with(out) unicode on rpmbuild command line):
 %define unicode 0
 
 # Configurable settings (use --with(out) unicode on rpmbuild command line):
 %define unicode 0


@@ -9,28 +9,26 @@
 %{?_without_unicode: %{expand: %%define unicode 0}}
 
 %if %{unicode}
 %{?_without_unicode: %{expand: %%define unicode 0}}
 
 %if %{unicode}

-%define wxconfigname wxbaseu-%{ver2}-config
+    %define name         wx-base-unicode
+    %define wxconfig     base-unicode-release-%{ver2}
+    %define wxconfiglink wxbaseu-%{ver2}-config

 %else
 %else

-%define wxconfigname wxbase-%{ver2}-config
+    %define name         wx-base
+    %define wxconfig     base-ansi-release-%{ver2}
+    %define wxconfiglink wxbase-%{ver2}-config

 %endif
 
 %endif
 

-%if %{unicode}
-%define name wx-base-unicode
-%else 
-%define name wx-base
-%endif
-
-Summary: wxBase library - non-GUI support classes of wxWindows toolkit
-Name:   %{name}
+Summary: wxBase library - non-GUI support classes of wxWidgets toolkit
+Name: %{name}

 Version: %{ver}
 Release: %{rel}
 License: wxWindows Licence
 Group: Development/Libraries
 Source: wxBase-%{ver}.tar.bz2
 Version: %{ver}
 Release: %{rel}
 License: wxWindows Licence
 Group: Development/Libraries
 Source: wxBase-%{ver}.tar.bz2

-URL: http://www.wxwindows.org
+URL: http://www.wxwidgets.org

 Packager: Vadim Zeitlin <vadim@wxwindows.org>
 Prefix: %{pref}
 Packager: Vadim Zeitlin <vadim@wxwindows.org>
 Prefix: %{pref}

-BuildRoot: /var/tmp/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-root

 Provides: wxBase
 
 %description
 Provides: wxBase
 
 %description


@@ -54,6 +52,7 @@ Header files for wxBase. You need them to develop programs using wxBase.
 %package static
 Summary: wxBase static libraries
 Group: Development/Libraries
 %package static
 Summary: wxBase static libraries
 Group: Development/Libraries

+Requires: %{name}-devel = %{ver}

 
 %description static
 Static libraries for wxBase. You need them if you want to link statically against wxBase.
 
 %description static
 Static libraries for wxBase. You need them if you want to link statically against wxBase.


@@ -63,37 +62,42 @@ Static libraries for wxBase. You need them if you want to link statically agains
 
 %build
 if [ "$SMP" != "" ]; then
 
 %build
 if [ "$SMP" != "" ]; then

-  export MAKE="make -j$SMP"
+    export MAKE="make -j$SMP"

 else
 else

-  export MAKE="make"
+    export MAKE="make"

 fi
 
 mkdir obj-shared
 cd obj-shared
 ../configure --prefix=%{pref} --disable-gui \
 %if %{unicode}
 fi
 
 mkdir obj-shared
 cd obj-shared
 ../configure --prefix=%{pref} --disable-gui \
 %if %{unicode}

-             --enable-unicode
+                              --enable-unicode

 %else
 %else

-             --with-odbc
+                              --disable-unicode \

 %endif
 $MAKE
 cd ..
 
 mkdir obj-static
 cd obj-static
 %endif
 $MAKE
 cd ..
 
 mkdir obj-static
 cd obj-static

-../configure --prefix=%{pref} --disable-shared --disable-gui \
+../configure --prefix=%{pref} --disable-gui --disable-shared \

 %if %{unicode}
 %if %{unicode}

-             --enable-unicode
+                              --enable-unicode

 %else
 %else

-             --with-odbc
+                              --disable-unicode \

 %endif
 $MAKE
 cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %endif
 $MAKE
 cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT

-(cd obj-static ; make prefix=$RPM_BUILD_ROOT%{pref} install)
-(cd obj-shared ; make prefix=$RPM_BUILD_ROOT%{pref} install)
+make -C locale allmo
+make -C obj-static DESTDIR=$RPM_BUILD_ROOT prefix=%{pref} install
+make -C obj-shared DESTDIR=$RPM_BUILD_ROOT prefix=%{pref} install
+
+# we need to modify the absolute wx-config link to be relative or rpm complains
+# (and our package wouldn't be relocatable)
+ln -sf ../lib/wx/config/%{wxconfig} $RPM_BUILD_ROOT/%{pref}/bin/wx-config

 
 %find_lang wxstd
 
 
 %find_lang wxstd
 


@@ -107,35 +111,41 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 
 %post devel
 /sbin/ldconfig
 
 %post devel

-# Install wx-config if there isn't any
-if test ! -f %{_bindir}/wx-config ; then
-    ln -sf wxbase-%{ver2}-config %{_bindir}/wx-config
-fi
+# link wx-config when you install RPM.
+ln -sf %{_libdir}/wx/config/%{wxconfig} %{_bindir}/wx-config
+# link wx-config with explicit name.
+ln -sf %{_libdir}/wx/config/%{wxconfig} %{_bindir}/%{wxconfiglink}
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig

 
 %preun devel
 
 %preun devel

-# Remove wx-config if it points to this package

 if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
 if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then

-  SUM1=`md5sum %{_bindir}/wxbase-%{ver2}-config | 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
+    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
 fi

+rm -f %{_bindir}/%{wxconfiglink}

 
 %files -f wxstd.lang
 %defattr (-,root,root)
 %doc COPYING.LIB *.txt
 
 %files -f wxstd.lang
 %defattr (-,root,root)
 %doc COPYING.LIB *.txt

-%{_libdir}/libwx_base*so.*
+%{_libdir}/libwx_base*-%{ver2}.so.*

 
 %files devel
 %defattr (-,root,root)
 
 %files devel
 %defattr (-,root,root)

-%dir %{_includedir}/wx
-%{_includedir}/wx/*
-%{_libdir}/libwx_base*.so
+%{_bindir}/wx-config
+%dir %{_includedir}/wx-%{ver2}
+%{_includedir}/wx-%{ver2}/*
+%{_libdir}/libwx_base*-%{ver2}.so

 %dir %{_libdir}/wx
 %{_libdir}/wx/*
 %dir %{_libdir}/wx
 %{_libdir}/wx/*

-%{_bindir}/wxbase*-%{ver2}-config

 %{_datadir}/aclocal/*.m4
 %{_datadir}/aclocal/*.m4

+%{_datadir}/bakefile/presets/*
+%{_datadir}/locale/*/LC_MESSAGES/*.mo

 
 %files static
 %defattr (-,root,root)
 
 %files static
 %defattr (-,root,root)