[templates_parser/f20: 6/7] remove unnecessary patches for 11.8.0

Wed May 7 17:21:41 UTC 2014

commit 418cf9d1d731ce02eea1806d7ca868137f67bd7e
Author: Julian Leyh <julian at vgai.de>
Date:   Sat Apr 19 01:00:02 2014 +0200

    remove unnecessary patches for 11.8.0

 templates_parser-docs-makefile.patch |   13 ------
 templates_parser-gpr.patch           |   23 ++---------
 templates_parser-makefile.patch      |   69 ++++++++++++++++-----------------
 templates_parser-soname.patch        |   10 -----
 templates_parser.spec                |    8 +---
 5 files changed, 38 insertions(+), 85 deletions(-)
---

diff --git a/templates_parser-gpr.patch b/templates_parser-gpr.patch
index 66851db..ada782f 100644
--- a/templates_parser-gpr.patch
+++ b/templates_parser-gpr.patch
@@ -1,8 +1,7 @@
-diff -ur config/templates_parser.gpr.orig config/templates_parser.gpr
---- config/templates_parser.gpr.orig	2012-06-27 21:06:00.352592170 +0200
-+++ config/templates_parser.gpr	2012-06-27 20:43:29.837560068 +0200
-@@ -26,18 +26,18 @@
- --  covered by the  GNU Public License.                                     --
+--- config/templates_parser.gpr.orig	2014-04-19 00:44:08.058221684 +0200
++++ config/templates_parser.gpr	2014-04-19 00:46:58.584541637 +0200
+@@ -16,18 +16,18 @@
+ --  to http://www.gnu.org/licenses for a complete copy of the license.      --
  ------------------------------------------------------------------------------
  
 +with "directories";
@@ -24,17 +23,3 @@ diff -ur config/templates_parser.gpr.orig config/templates_parser.gpr
     for Externally_Built use "true";
  
     package Naming renames TP_Shared.Naming;
-diff -ur config/tp_shared.gpr.orig config/tp_shared.gpr
---- config/tp_shared.gpr.orig	2012-06-27 21:06:00.352592170 +0200
-+++ config/tp_shared.gpr	2012-06-27 20:44:00.091560860 +0200
-@@ -35,10 +35,6 @@
-    type Tasking_Type is ("No_Tasking", "Standard_Tasking");
-    Tasking : Tasking_Type := TP_Config.Tasking;
- 
--   type Library_Kind is ("relocatable", "static");
--   Library_Type : Library_Kind :=
--      external ("LIBRARY_TYPE", TP_Config.Default_Library_Type);
--
-    ------------
-    -- Naming --
-    ------------
diff --git a/templates_parser-makefile.patch b/templates_parser-makefile.patch
index ba1debb..ee2f34b 100644
--- a/templates_parser-makefile.patch
+++ b/templates_parser-makefile.patch
@@ -1,59 +1,56 @@
---- makefile.orig	2012-06-29 18:23:17.081565325 +0200
-+++ makefile	2012-06-29 18:25:45.613568720 +0200
-@@ -32,7 +32,7 @@
+--- makefile.orig	2014-04-19 00:35:06.938893313 +0200
++++ makefile	2014-04-19 00:43:03.839218669 +0200
+@@ -22,7 +22,7 @@
  
  DEBUG        = false
  TP_TASKING   = Standard_Tasking
 -LIBRARY_TYPE = static
 +LIBRARY_TYPE = relocatable
- PROCESSORS   = 2
- PLATFORM     = native
+ PROCESSORS   = 0
+ HOST	     = $(shell gcc -dumpmachine)
+ TARGET	     = $(shell gcc -dumpmachine)
+@@ -34,7 +34,7 @@
  
-@@ -58,7 +58,7 @@
- I_TGP	= $(prefix)/lib/gnat/templates_parser
- I_DOC	= $(prefix)/share/doc/templates_parser
+ prefix	= $(dir $(shell which gnatls))..
+ 
+-ENABLE_STATIC = true
++ENABLE_STATIC = false
+ ENABLE_SHARED =$(shell $(GNAT) make -c -q -p -XTARGET=$(TARGET) \
+ 			-Pconfig/setup/test_shared 2>/dev/null && echo "true")
+ TP_XMLADA    = $(shell $(GNAT) make -c -q -p -XTARGET=$(TARGET) \
+@@ -66,7 +66,7 @@
+ I_GPR	= $(TPREFIX)/lib/gnat
+ I_TGP	= $(TPREFIX)/lib/gnat/templates_parser
  
 -CP	= cp -p
 +CP	= cp -dp
  MKDIR	= mkdir -p
  
  ifeq (${OS}, Windows_NT)
-@@ -106,10 +106,11 @@
- 		ENABLE_SHARED="$(ENABLE_SHARED)" AWS="$(AWS)"
+@@ -116,7 +116,7 @@
  
- GPROPTS = -XPRJ_BUILD=$(PRJ_BUILD) -XTP_XMLADA=$(TP_XMLADA) \
--		-XPROCESSORS=$(PROCESSORS)
-+		-XPROCESSORS=$(PROCESSORS) -XVERSION=$(VERSION) \
-+		$(GNATMAKE_OPTFLAGS)
+ GPROPTS += -XPRJ_BUILD=$(PRJ_BUILD) -XTP_XMLADA=$(TP_XMLADA) \
+ 		-XPROCESSORS=$(PROCESSORS) -XTARGET=$(TARGET) \
+-		-XVERSION=$(VERSION)
++		-XVERSION=$(VERSION) $(GNATMAKE_OPTFLAGS)
  
  build: setup_config tp_xmlada.gpr
--	$(GNAT) make -p $(GPROPTS) -XLIBRARY_TYPE=static \
-+	$(GNAT) make -p $(GPROPTS) -XLIBRARY_TYPE=relocatable \
- 		-Ptools/tools
+ ifeq ($(ENABLE_STATIC), true)
+@@ -179,7 +179,7 @@
+ 	$(MKDIR) -p $(DESTDIR)$(I_LIB)/static
+ endif
  ifeq ($(ENABLE_SHARED), true)
- 	$(GNAT) make -p $(GPROPTS) -XLIBRARY_TYPE=relocatable \
-@@ -155,21 +156,15 @@
- install_dirs:
- 	$(MKDIR) -p $(DESTDIR)$(I_BIN)
- 	$(MKDIR) -p $(DESTDIR)$(I_INC)
--	$(MKDIR) -p $(DESTDIR)$(I_LIB)/static
--ifeq ($(ENABLE_SHARED), true)
 -	$(MKDIR) -p $(DESTDIR)$(I_LIB)/relocatable
--endif
 +	$(MKDIR) -p $(DESTDIR)$(I_LIB)/templates_parser
+ endif
  	$(MKDIR) -p $(DESTDIR)$(I_GPR)
  	$(MKDIR) -p $(DESTDIR)$(I_TGP)
- 	$(MKDIR) -p $(DESTDIR)$(I_DOC)
- 
- install: install_dirs
- 	$(CP) src/*.ad* $(DESTDIR)$(I_INC)
--	$(CP) $(BDIR)/static/lib/* $(DESTDIR)$(I_LIB)/static
--ifeq ($(ENABLE_SHARED), true)
+@@ -191,7 +191,7 @@
+ 	$(CP) $(BDIR)/static/lib/* $(DESTDIR)$(I_LIB)/static
+ endif
+ ifeq ($(ENABLE_SHARED), true)
 -	$(CP) $(BDIR)/relocatable/lib/* $(DESTDIR)$(I_LIB)/relocatable
--endif
--	$(CP) $(BDIR)/static/bin/* $(DESTDIR)$(I_BIN)
 +	$(CP) $(BDIR)/relocatable/lib/* $(DESTDIR)$(I_LIB)/templates_parser
-+	$(CP) $(BDIR)/relocatable/bin/* $(DESTDIR)$(I_BIN)
+ endif
+ 	$(CP) $(BDIR)/$(LIBRARY_TYPE)/bin/* $(DESTDIR)$(I_BIN)
  	$(CP) config/templates_parser.gpr $(DESTDIR)$(I_GPR)
- 	$(CP) config/tp_shared.gpr $(DESTDIR)$(I_TGP)
- 	$(CP) tp_xmlada.gpr $(DESTDIR)$(I_TGP)
diff --git a/templates_parser.spec b/templates_parser.spec
index 59a3f08..5141825 100644
--- a/templates_parser.spec
+++ b/templates_parser.spec
@@ -19,13 +19,9 @@ Source2:        templatespp.1
 Patch1:         %{name}-makefile.patch
 # adjust GPRs to Fedora standard
 Patch2:         %{name}-gpr.patch
-# make linking dynamic
-Patch3:         %{name}-docs-makefile.patch
-# add soname
-Patch4:         %{name}-soname.patch
 
 # All Ada packages have to contain these
-BuildRequires:  gcc-gnat fedora-gnat-project-common
+BuildRequires:  gcc-gnat fedora-gnat-project-common gprbuild
 ExclusiveArch:  %{GNAT_arches}
 
 BuildRequires:  xmlada-devel
@@ -66,8 +62,6 @@ AWS templates engine templates_parser.
 %setup -q
 %patch1
 %patch2
-%patch3
-%patch4
 
 
 %build
