- Update to new development snapshot 3.1.1~2640

- Rework provides/conflicts between -devel variants.

OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=36

wxGTK3-3_2.spec

@@ -20,8 +20,8 @@ Name:           wxGTK3-3_2
 %define base_name wxWidgets-3_2
 %define tarball_name wxWidgets
 %define variant suse
-%define sonum 4
-Version:        3.1.1~2244
+%define sonum 5
+Version:        3.1.1~2640
 Release:        0
 %define wx_minor 3.1
 %define wx_micro 3.1.1
@@ -70,7 +70,6 @@ wxWidgets is a C++ library for cross-platform GUI.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-%if %base_packages
 %package -n libwx_baseu-%variant%sonum
 Summary:        wxWidgets Library
 # Name up to openSUSE 11.3 and up to wxGTK-2.8:
@@ -98,8 +97,6 @@ Group:          System/Libraries
 %description -n libwx_baseu_xml-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%endif
-
 %package -n libwx_%{toolkit}u_adv-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
@@ -184,7 +181,6 @@ Group:          System/Libraries
 %description -n libwx_%{toolkit}u_xrc-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%if %base_packages
 %package plugin-sound_sdlu-3_2
 Summary:        wxWidgets SDL Plugin
 Group:          System/Libraries
@@ -192,8 +188,6 @@ Group:          System/Libraries
 %description plugin-sound_sdlu-3_2
 SDL Plugin for the wxWidgets cross-platform GUI.
 
-%endif
-
 %package devel
 Summary:        Development files for GTK3-backed wxWidgets 3.2
 Group:          Development/Libraries/C and C++
@@ -244,32 +238,29 @@ autoconf -f -i
 # --enable-accessibility is currently supported only in msw
 # --enable-extended_rtti does not compile
 
-%configure\
+%configure \
 	--enable-vendor=%variant \
-	--with-gtk=%gtk_version\
-	--enable-unicode\
-	--with-opengl\
-	--with-libmspack\
-	--with-sdl\
-	--enable-ipv6\
-	--enable-mediactrl\
-	--enable-optimise\
+	--with-gtk=%gtk_version \
+	--enable-unicode \
+	--with-opengl \
+	--with-libmspack \
+	--with-sdl \
+	--enable-ipv6 \
+	--enable-mediactrl \
+	--enable-optimise \
 %if 0%{?WX_DEBUG}
-	--enable-debug\
+	--enable-debug \
 %else
-	--disable-debug\
+	--disable-debug \
 %endif
-	--enable-stl\
+	--enable-stl \
 	--enable-plugins
 make %{?_smp_mflags}
 
-%clean
-:
-
 %install
 export VENDORTAG='-$variant' # only needed for non-MSW
 make install DESTDIR="%buildroot"
-%if %base_packages==0
+%if !%base_packages
 # Drop libraries already supplied by another packages
 rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \
    "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
@@ -279,14 +270,12 @@ rm -Rf %buildroot/%_datadir/locale
 # HACK: Fix wx-config symlink (bug introduced in 2.9.4).
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
-%if %base_packages
 %post   -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
 %post   -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
 %post   -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
-%endif
 %post   -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
 %post   -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig