dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wxGTK
-# $Id$
-NAME := wxGTK
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

wxGTK.spec

@@ -6,7 +6,7 @@
 
 Name:           wxGTK
 Version:        2.6.3
-Release:        1%{?dist}
+Release:        2.6.3.2.3%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -15,6 +15,7 @@ License:        wxWidgets Library Licence
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
+Patch0:         wxGTK-2.6.3.2-cvs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
@@ -55,6 +56,7 @@ Summary:        Development files for the wxGTK2 library
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-gl = %{version}-%{release}
 Requires:       gtk2-devel
+Requires:       libGL-devel, libGLU-devel
 Obsoletes:      wxGTK2-devel < %{version}-%{release}
 Provides:       wxGTK2-devel = %{version}-%{release}
 Obsoletes:      wxGTK-common-devel < %{version}-%{release}
@@ -87,6 +89,8 @@ ODBC (a SQL database connectivity API) add-on for the wxWidgets library.
 %prep
 %setup -q
 
+%patch0 -p1 -b .2.6.3.2
+
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
 
@@ -190,11 +194,20 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Fri May 31 2006 Matthwe Miller <mattdm@mattdm.org> - 2.6.3-1
-- mesa-*-devel buildrequires to just *-devel, for building on FC4 and
-  for The Future
+* Mon Aug 28 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-2.6.3.2.3
+- bump release for FC6 rebuild
 
-* Sat Mar 25 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-0    
+* Mon Jul  3 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-2.6.3.2.2
+- add libGL-devel and libGLU-devel requires to wxGTK-devel package
+  (see bug #197501).
+
+* Thu Apr 13 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-2.6.3.2.1
+- oops -- forgot to change mesa-libGL*-devel -> libGL*-devel
+
+* Thu Apr 13 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-2.6.3.2.0
+- patch to cvs subrelease 2.6.3.2 (matches wxPython)
+
+* Sat Mar 25 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-1    
 - 2.6.3 final
 - remove the locale_install thing -- that was just an issue with using the
   release candidate.
@@ -250,7 +263,7 @@ rm -rf $RPM_BUILD_ROOT
   Add dist tag.
 - From Tom Callaway: Build and include libwx_gtk2u_animate-2.6.
 
-
+* Thu Apr 28 2005 Matthew Miller <mattdm@mattdm.org> 2.6.1-0.1
 - update to 2.6.1
 - from Michael Schwendt in 2.4.2-11 package: build-require
   xorg-x11-Mesa-libGL and xorg-x11-Mesa-libGLU (the libGL and libGLU