fixes for RPM generation after Ron's changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxBase.spec b/wxBase.spec
index 7c5b95e99392f4670d182adf2914fecacd19f316..1f7219c174a6dea71d7ae252083621f0a99457d2 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,5 +1,6 @@
 %define pref /usr
 %define ver 2.3.1
 %define pref /usr
 %define ver 2.3.1

+%define ver2 2.3

 %define rel 1
 
 Summary: wxBase library - non-GUI support classes of wxWindows toolkit
 %define rel 1
 
 Summary: wxBase library - non-GUI support classes of wxWindows toolkit


@@ -68,6 +69,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{pref}/lib/wx/include/wx/base
 %{pref}/lib/wx/include/wx/base/setup.h
 %defattr (644, root, root, 755)
 %dir %{pref}/lib/wx/include/wx/base
 %{pref}/lib/wx/include/wx/base/setup.h
 %defattr (644, root, root, 755)

-%attr(755, -, -) %{pref}/bin/wxbase-config
+%attr(755, -, -) %{pref}/bin/wxbase-%{ver2}-config

 %attr(755, -, -) %{pref}/bin/wx-config
 
 %attr(755, -, -) %{pref}/bin/wx-config
 

diff --git a/wxGTK.spec b/wxGTK.spec
index a27b7bfcd57ed86bf18b5196e908452fdcb18835..d041e3f0ec757543ac49623f7860cb53b24a24d0 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,6 +1,7 @@
 %define pref /usr
 %define pref /usr

-%define ver 2.3.1
-%define rel 1
+%define ver 2.3.2
+%define ver2 2.3
+%define rel 0

 
 Summary: The GTK+ 1.2 port of the wxWindows library
 Name: wxGTK
 
 Summary: The GTK+ 1.2 port of the wxWindows library
 Name: wxGTK


@@ -22,7 +23,7 @@ Provides: wxwin
 # in addition, we should provide libwx_gtk as automatic generator only notices
 # libwx_gtk-%{ver}-%{rel}
 Provides: libwx_gtk.so
 # in addition, we should provide libwx_gtk as automatic generator only notices
 # libwx_gtk-%{ver}-%{rel}
 Provides: libwx_gtk.so

-Provides: libwx_gtk-2.3.so
+Provides: libwx_gtk-%{ver2}.so

 
 %description
 wxWindows is a free C++ library for cross-platform GUI development.
 
 %description
 wxWindows is a free C++ library for cross-platform GUI development.


@@ -72,8 +73,7 @@ make prefix=$RPM_BUILD_ROOT%{pref} install
 %doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
 %dir %{pref}/share/wx
 %{pref}/share/wx/*
 %doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
 %dir %{pref}/share/wx
 %{pref}/share/wx/*

-%attr(755, root, root) %{pref}/lib/libwx_gtk.*
-%attr(755, root, root) %{pref}/lib/libwx_gtk-2.3.*
+%attr(755, root, root) %{pref}/lib/libwx_gtk-%{ver2}.*

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


@@ -81,7 +81,7 @@ make prefix=$RPM_BUILD_ROOT%{pref} install
 %{pref}/include/wx/*
 %dir %{pref}/lib/wx
 %{pref}/lib/wx/*
 %{pref}/include/wx/*
 %dir %{pref}/lib/wx
 %{pref}/lib/wx/*

-%attr(755, root, root) %{pref}/bin/wxgtk-config
+%attr(755, root, root) %{pref}/bin/wxgtk-%{ver2}-config

 %attr(755, root, root) %{pref}/bin/wx-config
 
 %files gl
 %attr(755, root, root) %{pref}/bin/wx-config
 
 %files gl

diff --git a/wxMotif.spec b/wxMotif.spec
index 94744e220b44bac535829f2664c88d0b0e82e13d..2ae0e26255f9ed8d8cbc5a518d96f7465ae3d84f 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -4,6 +4,7 @@
 # Note that this is NOT a relocatable package
 %define pref /usr
 %define ver 2.3.1
 # Note that this is NOT a relocatable package
 %define pref /usr
 %define ver 2.3.1

+%define ver2 2.3

 %define rel 1
 
 Summary: The Motif/Lesstif port of the wxWindows library
 %define rel 1
 
 Summary: The Motif/Lesstif port of the wxWindows library


@@ -73,8 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
 %dir %{pref}/share/wx
 %{pref}/share/wx/*
 %doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
 %dir %{pref}/share/wx
 %{pref}/share/wx/*

-%attr(755, -, -) %{pref}/lib/libwx_motif.*
-%attr(755, -, -) %{pref}/lib/libwx_motif-2.1.*
+%attr(755, -, -) %{pref}/lib/libwx_motif-%{ver2}.*

 
 %files devel
 %defattr (644, root, root, 755)
 
 %files devel
 %defattr (644, root, root, 755)


@@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %{pref}/include/wx/*
 %dir %{pref}/lib/wx
 %{pref}/lib/wx/*
 %{pref}/include/wx/*
 %dir %{pref}/lib/wx
 %{pref}/lib/wx/*

-%attr(755, -, -) %{pref}/bin/wxmotif-config
+%attr(755, -, -) %{pref}/bin/wxmotif-%{ver2}-config

 %attr(755, -, -) %{pref}/bin/wx-config
 
 %files gl
 %attr(755, -, -) %{pref}/bin/wx-config
 
 %files gl