modified make and .spec files to build distribution files names with version suffix (like wxFoo-major.minor.micro)

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

Makefile.in

@@ -150,15 +150,17 @@ INTLDIR  = $(WXDIR)/locale
 
 ########################## Archive name ###############################
 
-WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+# append a version suffix x.y.z to all file names
-WXGLARCHIVE = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
-WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+WXARCHIVE = @DISTDIR@-$(VER_SUFFIX).tar.gz
-WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+WXGLARCHIVE = @DISTDIR@-gl-$(VER_SUFFIX).tar.gz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
+WXDEMOS = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
 
-WXARCHIVE_BZIP = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
+WXARCHIVE_BZIP = @DISTDIR@-$(VER_SUFFIX).tar.bz2
-WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
+WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
-WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
+WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
-WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
+WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
 
 DISTDIR = ./_dist_dir/@DISTDIR@
 
@@ -1277,15 +1279,18 @@ distclean:
 dist: @GUIDIST@
 	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	cd _dist_dir; tar ch @DISTDIR@ | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+	@cd _dist_dir; \
+	mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
+	tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
+	mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
-	mv samples wxSamples; \
+	mv samples wxSamples-$(VER_SUFFIX); \
-	tar ch wxSamples | gzip -f9 > ../../$(WXSAMPLES); \
+	tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
-	mv wxSamples samples; \
+	mv wxSamples-$(VER_SUFFIX) samples; \
-	mv demos wxDemos; \
+	mv demos wxDemos-$(VER_SUFFIX); \
-	tar ch wxDemos | gzip -f9 > ../../$(WXDEMOS); \
+	tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
-	mv wxDemos demos; \
+	mv wxDemos-$(VER_SUFFIX) demos; \
 	fi
 
 bzip-dist: @GUIDIST@

wxBase.spec

@@ -1,6 +1,5 @@
-# Note that this is NOT a relocatable package
 %define pref /usr
-%define ver 2.1.16
+%define ver 2.3.0
 %define rel 0
 
 Summary: wxBase library - non-GUI support classes of wxWindows toolkit
@@ -12,7 +11,8 @@ Group: Development/Libraries
 Source: wxBase-%{ver}.tar.gz
 URL: none
 Packager: Vadim Zeitlin <vadim@wxwindows.org>
-BuildRoot: /tmp/wxBase_rpm
+Prefix: %{pref}
+BuildRoot: /var/tmp/%{name}-root
 
 %description
 wxBase is a collection of C++ classes providing basic data structures (strings,
@@ -32,7 +32,7 @@ Requires: wxBase
 Header files for wxBase. You need them to develop programs using wxBase.
 
 %prep
-%setup -n wxBase
+%setup -n wxBase-%{ver}
 ./configure --prefix=%{pref} --disable-gui --disable-std_iostreams
 
 %build
@@ -58,12 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr (644, root, root, 755)
-%doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
+%doc COPYING.LIB LICENCE.txt README.txt SYMBOLS.txt
-%attr(755, -, -) %{pref}/lib/libwxbase*
+%attr(755, -, -) %{pref}/lib/libwx_base*
 %dir %{pref}/lib/wx
 %dir %{pref}/lib/wx/include
 %dir %{pref}/lib/wx/include/wx
-%{pref}/lib/wx/include/wx/setup.h
+%{pref}/lib/wx/include/wx/base/setup.h
 
 %files devel -f src/rpmfiles.lst
 %defattr (644, root, root, 755)

wxGTK.spec

@@ -1,4 +1,3 @@
-# Note that this is NOT a relocatable package
 %define pref /usr
 %define ver 2.3.0
 %define rel 0
@@ -9,15 +8,22 @@ Version: %{ver}
 Release: %{rel}
 Copyright: wxWindows Licence
 Group: X11/Libraries
-Source: wxGTK-%{ver}.tgz
+Source: wxGTK-%{ver}.tar.gz
 URL: http://wxwindows.org
-Packager: Robert Roebling <robert@roebling.de>
+Packager: Vadim Zeitlin <vadim@wxwindows.org>
+Prefix: %{pref}
+BuildRoot: /var/tmp/%{name}-root
 
 # all packages providing an implementation of wxWindows library (regardless of
 # the toolkit used) should provide the (virtual) wxwin package, this makes it
 # possible to require wxwin instead of requiring "wxgtk or wxmotif or wxqt..."
 Provides: wxwin
 
+# in addition, we should provide libwx_gtk as automatic generator only notices
+# libwx_gtk-%{ver}-%{rel}
+Provides: libwx_gtk.so
+Provides: libwx_gtk-2.2.so
+
 %description
 wxWindows is a free C++ library for cross-platform GUI development.
 With wxWindows, you can create applications for different GUIs (GTK+,
@@ -40,7 +46,7 @@ Requires: wxGTK
 OpenGl add-on library for wxGTK, the GTK+ 1.2 port of the wxWindows library.
 
 %prep
-%setup -n wxGTK
+%setup -n wxGTK-%{ver}
 ./configure --prefix=%{pref} --enable-burnt_name --with-odbc --with-opengl
 
 %build
@@ -52,7 +58,8 @@ fi
 $MAKE
 
 %install
-make install
+rm -rf $RPM_BUILD_ROOT
+make prefix=$RPM_BUILD_ROOT%{pref} install
 
 %post
 /sbin/ldconfig