From 25cd0e82248d0d35fd769238c31637abfbf033a3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:27:08 +0000 Subject: [PATCH 1/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 74a1612..8d964f6 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: amanith -# $Id$ +# $Id: Makefile,v 1.1 2007/12/20 19:29:50 spot Exp $ NAME := amanith 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From c3346786f1570439e2f3b1a92db85f5fb7feb753 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:42:41 +0000 Subject: [PATCH 2/5] Initialize branch EL-6 for amanith --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 6629313ad61f73ca30fb5314edf6c4f1fef9d212 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 8 Jul 2010 20:06:10 +0000 Subject: [PATCH 3/5] sync --- amanith-0.3-fix-DSO.patch | 17 +++++++++++++++++ amanith.spec | 7 ++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 amanith-0.3-fix-DSO.patch diff --git a/amanith-0.3-fix-DSO.patch b/amanith-0.3-fix-DSO.patch new file mode 100644 index 0000000..6b9ff51 --- /dev/null +++ b/amanith-0.3-fix-DSO.patch @@ -0,0 +1,17 @@ +diff -up amanith/examples/opengl/testshaders/testshaders.pro.DSO amanith/examples/opengl/testshaders/testshaders.pro +--- amanith/examples/opengl/testshaders/testshaders.pro.DSO 2010-02-10 11:39:49.917762524 -0500 ++++ amanith/examples/opengl/testshaders/testshaders.pro 2010-02-10 11:40:23.487766249 -0500 +@@ -9,9 +9,11 @@ CONFIG += qt warn_on opengl + SOURCES = main.cpp \ + testshaders.cpp + ++LIBS += -lGLEW ++ + win32: RC_FILE = example.rc + + # Qt4 support + contains(DEFINES, USE_QT4) { + QT += opengl +-} +\ No newline at end of file ++} diff --git a/amanith.spec b/amanith.spec index fabe3e1..577a171 100644 --- a/amanith.spec +++ b/amanith.spec @@ -1,6 +1,6 @@ Name: amanith Version: 0.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Crossplatform framework for 2d/3d vector graphics Group: Development/Libraries License: QPL @@ -21,6 +21,7 @@ Patch6: amanith-0.3-freetype-fix.patch Patch7: amanith-0.3-system-freetype.patch Patch8: amanith-0.3-gcc43.patch Patch9: amanith-0.3-gcc44.patch +Patch10: amanith-0.3-fix-DSO.patch %description Amanith is an OpenSource C++ CrossPlatform framework designed for 2d & 3d @@ -47,6 +48,7 @@ Development libraries and headers for developing programs that use amanith. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 -b .DSO # Boo. Hiss. SGI Free B and GLX files. rm -rf include/GL/ # Don't need the 3rdpart stuff either. @@ -103,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/amanith/ %changelog +* Wed Feb 10 2010 Tom "spot" Callaway - 0.3-14 +- fix implicit DSO linking + * Wed Aug 19 2009 Tom "spot" Callaway - 0.3-13 - note that upstream is gone, drop URL from Source0 From cb241344b5f3dd5600de62b74b816b8d9c1f7a36 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 9 Jul 2010 16:59:11 +0000 Subject: [PATCH 4/5] repacked tarball --- amanith.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/amanith.spec b/amanith.spec index 577a171..0a524d6 100644 --- a/amanith.spec +++ b/amanith.spec @@ -1,6 +1,6 @@ Name: amanith Version: 0.3 -Release: 14%{?dist} +Release: 14%{?dist}.1 Summary: Crossplatform framework for 2d/3d vector graphics Group: Development/Libraries License: QPL @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/amanith/ %changelog +* Fri Jul 9 2010 Tom "spot" Callaway - 0.3-14.1 +- repacked tarball (old one wouldn't open on EL-6 for some reason) + * Wed Feb 10 2010 Tom "spot" Callaway - 0.3-14 - fix implicit DSO linking diff --git a/sources b/sources index ce6fc52..3faf8bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -392e79d36cc2d57921c7fefacbc4d4a3 amanith_03.tar.gz +9c7e4607a3260fd4acbad66d22dc3eb0 amanith_03.tar.gz From 6356d4e4c78a976499668b26be1761243140cb9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:47:52 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8d964f6..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: amanith -# $Id: Makefile,v 1.1 2007/12/20 19:29:50 spot Exp $ -NAME := amanith -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6