rpms/xmlada
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New release 4.3 (2012)

Browse source
This commit is contained in:
Pavel Zhukov 2012-12-18 14:24:48 +04:00
commit f04ea97fe7
8 changed files with 287 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
/xmlada-gpl-3.2.1-src.tgz
/xmlada-gpl-4.1-src.tgz
/xmlada-gpl-4.3-src.tgz

2
sources
View file

@ -1 +1 @@
c17ac563b8375bd652a0eb8e141cda59 xmlada-gpl-4.1-src.tgz
764c474e8334b263dc3c2dd95693484d xmlada-gpl-4.3-src.tgz

157
xmlada-4.1-destdir.patch
View file

@ -1,157 +0,0 @@
--- a/Makefile.in 2011-07-16 11:17:09.335569486 +0400
+++ b/Makefile.in 2011-07-16 11:19:13.406569528 +0400
@@ -2,7 +2,7 @@
## relocatable
## static
LIBRARY_TYPE=static
-
+DESTDIR ?=
# Replace with the location for the installation directory
INSTALL=@INSTALL@
PACKAGE_TARNAME=@PACKAGE_TARNAME@
@@ -114,30 +114,30 @@
cd ${xmllib}; ${CHMOD} ugo-w *.ali
install_dirs: force
- @${MKDIR} ${bindir}
- @${MKDIR} ${xmllib}
- @${MKDIR} ${libdir}/gnat/xmlada
- @${MKDIR} ${datadir}/doc/xmlada
- @${MKDIR} ${includedir}/xmlada
- @${MKDIR} ${datadir}/gps/plug-ins/
+ @${MKDIR} ${DESTDIR}/${bindir}
+ @${MKDIR} ${DESTDIR}/${xmllib}
+ @${MKDIR} ${DESTDIR}/${libdir}/gnat/xmlada
+ @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada
+ @${MKDIR} ${DESTDIR}/${includedir}/xmlada
+ @${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/
## Do the installation for either shared or static, depending on
## $LIBRARY_TYPE
install_library_type: install_dirs ${MODULE_INSTALL}
- ${INSTALL} distrib/xmlada_shared.gpr ${libdir}/gnat
- ${INSTALL} distrib/xmlada.gpr ${libdir}/gnat/
- ${INSTALL} distrib/xmlada_dom.gpr ${libdir}/gnat/
- ${INSTALL} distrib/xmlada_sax.gpr ${libdir}/gnat/
- ${INSTALL} distrib/xmlada_input.gpr ${libdir}/gnat/
- ${INSTALL} distrib/xmlada_schema.gpr ${libdir}/gnat/
- ${INSTALL} distrib/xmlada_unicode.gpr ${libdir}/gnat/
- ${INSTALL} xmlada-config ${bindir}
- -${INSTALL} docs/xml.ps ${datadir}/doc/xmlada 2>/dev/null
- -${INSTALL} docs/xml.pdf ${datadir}/doc/xmlada
- -${INSTALL} docs/xml.html ${datadir}/doc/xmlada
- -${INSTALL} docs/xml.info ${datadir}/doc/xmlada
- ${CHMOD} +x ${bindir}/xmlada-config
- ${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/
+ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${libdir}/gnat
+ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${libdir}/gnat/
+ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${libdir}/gnat/
+ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${libdir}/gnat/
+ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${libdir}/gnat/
+ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${libdir}/gnat/
+ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${libdir}/gnat/
+ ${INSTALL} xmlada-config ${DESTDIR}/${bindir}
+ -${INSTALL} docs/xml.ps ${DESTDIR}/${datadir}/doc/xmlada 2>/dev/null
+ -${INSTALL} docs/xml.pdf ${DESTDIR}/${datadir}/doc/xmlada
+ -${INSTALL} docs/xml.html ${DESTDIR}/${datadir}/doc/xmlada
+ -${INSTALL} docs/xml.info ${DESTDIR}/${datadir}/doc/xmlada
+ ${CHMOD} +x ${DESTDIR}/${bindir}/xmlada-config
+ ${INSTALL} distrib/xmlada_gps.py ${DESTDIR}/${datadir}/gps/plug-ins/
## Do the installation for an explicit target
install_static:
--- a/Makefile.in 2011-07-16 11:21:57.232569582 +0400
+++ b/Makefile.in 2011-07-16 11:22:12.952569588 +0400
@@ -1,7 +1,7 @@
## The type of library we want to build. Possible values:
## relocatable
## static
-LIBRARY_TYPE=static
+LIBRARY_TYPE=relocatable
DESTDIR ?=
# Replace with the location for the installation directory
INSTALL=@INSTALL@
--- a/Makefile.in 2011-07-16 11:27:57.295569704 +0400
+++ b/Makefile.in 2011-07-16 11:30:25.628569754 +0400
@@ -91,27 +91,27 @@
# Rule for installing the modules
%_inst: force
- ${CP} $*/*.ad[bs] ${includedir}/xmlada
- cd $*; ls *.ad[bs] > ${libdir}/gnat/xmlada/xmlada_$*.lgpr
- -cd ${xmllib}; ${CHMOD} ugo+w *.ali
- -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${xmllib}
- ${RM} ${libdir}/libxmlada_$**
- ${RM} ${xmllib}libxmlada_$**
+ ${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada
+ cd $*; ls *.ad[bs] > ${DESTDIR}/${libdir}/gnat/xmlada/xmlada_$*.lgpr
+ -cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali
+ -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}/${xmllib}
+ ${RM} ${DESTDIR}/${libdir}/libxmlada_$**
+ ${RM} ${DESTDIR}/${xmllib}libxmlada_$**
ifeq (${LIBRARY_TYPE},static)
- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib}
+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}/${xmllib}
else
ifeq (${OS},Windows_NT)
${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${xmllib}
cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT}
else
- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${xmllib}
- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}
- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION}
+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${DESTDIR}/${xmllib}
+ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}
+ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
+ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
+ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION}
endif
endif
- cd ${xmllib}; ${CHMOD} ugo-w *.ali
+ cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo-w *.ali
install_dirs: force
@${MKDIR} ${DESTDIR}/${bindir}
--- a/Makefile.in 2011-07-16 11:47:49.580570102 +0400
+++ b/Makefile.in 2011-07-16 11:49:47.465570142 +0400
@@ -92,7 +92,7 @@
# Rule for installing the modules
%_inst: force
${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada
- cd $*; ls *.ad[bs] > ${DESTDIR}/${libdir}/gnat/xmlada/xmlada_$*.lgpr
+ cd $*; ls *.ad[bs] > ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr
-cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali
-${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}/${xmllib}
${RM} ${DESTDIR}/${libdir}/libxmlada_$**
@@ -116,7 +116,7 @@
install_dirs: force
@${MKDIR} ${DESTDIR}/${bindir}
@${MKDIR} ${DESTDIR}/${xmllib}
- @${MKDIR} ${DESTDIR}/${libdir}/gnat/xmlada
+ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada
@${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada
@${MKDIR} ${DESTDIR}/${includedir}/xmlada
@${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/
@@ -124,13 +124,13 @@
## Do the installation for either shared or static, depending on
## $LIBRARY_TYPE
install_library_type: install_dirs ${MODULE_INSTALL}
- ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${libdir}/gnat
- ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${libdir}/gnat/
- ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${libdir}/gnat/
- ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${libdir}/gnat/
- ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${libdir}/gnat/
- ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${libdir}/gnat/
- ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${libdir}/gnat/
+ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${ADA_PROJECT_PATH}
+ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/
+ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/
+ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/
+ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/
+ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/
+ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/
${INSTALL} xmlada-config ${DESTDIR}/${bindir}
-${INSTALL} docs/xml.ps ${DESTDIR}/${datadir}/doc/xmlada 2>/dev/null
-${INSTALL} docs/xml.pdf ${DESTDIR}/${datadir}/doc/xmlada

19
xmlada-4.1-gnatflags.patch
View file

@ -1,19 +0,0 @@
--- a/Makefile.in 2011-07-16 12:05:27.728570456 +0400
+++ b/Makefile.in 2011-07-16 12:06:24.945570476 +0400
@@ -3,6 +3,7 @@
## static
LIBRARY_TYPE=relocatable
DESTDIR ?=
+GNATFLAGS ?=
# Replace with the location for the installation directory
INSTALL=@INSTALL@
PACKAGE_TARNAME=@PACKAGE_TARNAME@
@@ -20,7 +21,7 @@
# Set a default value (ignored if set in the environment)
PROCESSORS?=1
-GNATMAKE=@gnatmake@ -j${PROCESSORS}
+GNATMAKE=@gnatmake@ ${GNATFLAGS}
# Compiler mode: one of "distrib", "debug", "optimize", "profile"
MODE=distrib

207
xmlada-4.3-destdir.patch Normal file
View file

@ -0,0 +1,207 @@
--- a/Makefile.in 2012-12-18 11:49:31.486648187 +0400
+++ b/Makefile.in 2012-12-18 11:53:34.411498184 +0400
@@ -1,7 +1,8 @@
## The type of library we want to build. Possible values:
## relocatable
## static
-LIBRARY_TYPE=static
+LIBRARY_TYPE=relocatable
+DESTDIR ?=
# Replace with the location for the installation directory
INSTALL=@INSTALL@
@@ -53,7 +54,7 @@
ifeq (${BUILDS_SHARED},yes)
all: static relocatable
-install: install_static install_relocatable
+install: install_relocatable
else
all: static
install: install_static
@@ -114,29 +115,29 @@
cd ${xmllib}; ${CHMOD} ugo-w *.ali
install_dirs: force
- @${MKDIR} ${bindir}
- @${MKDIR} ${xmllib}
- @${MKDIR} ${prefix}/lib/gnat/xmlada
- @${MKDIR} ${libdir}
- @${MKDIR} ${datadir}/doc/xmlada
- @${MKDIR} ${includedir}/xmlada
- @${MKDIR} ${datadir}/gps/plug-ins/
+ @${MKDIR} ${DESTDIR}/${bindir}
+ @${MKDIR} ${DESTDIR}/${xmllib}
+ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}xmlada
+ @${MKDIR} ${DESTDIR}/${libdir}
+ @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada
+ @${MKDIR} ${DESTDIR}/${includedir}/xmlada
+ @${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/
## Do the installation for either shared or static, depending on
## $LIBRARY_TYPE
install_library_type: install_dirs ${MODULE_INSTALL}
- ${INSTALL} distrib/xmlada_shared.gpr ${prefix}/lib/gnat/
- ${INSTALL} distrib/xmlada.gpr ${prefix}/lib/gnat/
- ${INSTALL} distrib/xmlada_dom.gpr ${prefix}/lib/gnat/
- ${INSTALL} distrib/xmlada_sax.gpr ${prefix}/lib/gnat/
- ${INSTALL} distrib/xmlada_input.gpr ${prefix}/lib/gnat/
- ${INSTALL} distrib/xmlada_schema.gpr ${prefix}/lib/gnat/
- ${INSTALL} distrib/xmlada_unicode.gpr ${prefix}/lib/gnat/
- ${INSTALL} xmlada-config ${bindir}
- -$(CP) -r docs/_build/html/* $(datadir)/doc/xmlada/ 2>/dev/null
- -$(CP) -r docs/_build/latex/XMLAda.pdf $(datadir)/doc/xmlada/ 2>/dev/null
- ${CHMOD} +x ${bindir}/xmlada-config
- ${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/
+ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${ADA_PROJECT_PATH}
+ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${ADA_PROJECT_PATH}
+ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${ADA_PROJECT_PATH}
+ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${ADA_PROJECT_PATH}
+ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${ADA_PROJECT_PATH}
+ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${ADA_PROJECT_PATH}
+ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${ADA_PROJECT_PATH}
+ ${INSTALL} xmlada-config ${DESTDIR}/${bindir}
+ -$(CP) -r docs/_build/html/* ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null
+ -$(CP) -r docs/_build/latex/XMLAda.pdf ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null
+ ${CHMOD} +x ${DESTDIR}/${bindir}/xmlada-config
+ ${INSTALL} distrib/xmlada_gps.py ${DESTDIR}/${datadir}/gps/plug-ins/
## Do the installation for an explicit target
install_static:
--- a/Makefile.314.in 2012-12-18 11:59:49.344264437 +0400
+++ b/Makefile.314.in 2012-12-18 12:00:49.167974062 +0400
@@ -12,14 +12,14 @@
all: ${MODULES}
install: install_dirs all
- cd ${PREFIX}/include/xmlada; ${CHMOD} -w *.ali
+ cd ${DESTDIR}/${PREFIX}/include/xmlada; ${CHMOD} -w *.ali
install_dirs: force
- ${MKDIR} ${PREFIX}/lib
- ${MKDIR} ${PREFIX}/include/xmlada
- ${MKDIR} ${PREFIX}/bin
- ${CP} xmlada-config ${PREFIX}/bin
- ${CHMOD} +x ${PREFIX}/bin/xmlada-config
+ ${MKDIR} ${DESTDIR}/${PREFIX}/lib
+ ${MKDIR} ${DESTDIR}/${PREFIX}/include/xmlada
+ ${MKDIR} ${DESTDIR}/${PREFIX}/bin
+ ${CP} xmlada-config ${DESTDIR}/${PREFIX}/bin
+ ${CHMOD} +x ${DESTDIR}/${PREFIX}/bin/xmlada-config
${MODULES}: force
cd $@; ${MAKE} -f ../Makefile.module.314
--- a/Makefile.module.314 2012-12-18 12:04:43.429701164 +0400
+++ b/Makefile.module.314 2012-12-18 12:06:05.130548705 +0400
@@ -17,7 +17,7 @@
SRC=${wildcard *.ads}
OBJ=${SRC:%.ads=%.o}
-
+DESTDIR ?=
libname=libxmlada_${MODULE}
soname=libxmlada_${MODULE}-${MAJOR}.${MINOR}
@@ -37,12 +37,11 @@
ifeq (${BUILD_SHARED}, TRUE)
cd obj; ${CC} -shared -o ${soname}.so ${OBJ}
endif
- cd obj; ${CP} *.ali ${PREFIX}/include/xmlada
- ${CP} *.ad[bs] ${PREFIX}/include/xmlada
- cd obj; ${CP} ${libname}.a ${PREFIX}/lib
+ cd obj; ${CP} *.ali ${DESTDIR}/${PREFIX}/include/xmlada
+ ${CP} *.ad[bs] ${DESTDIR}/${PREFIX}/include/xmlada
ifeq (${BUILD_SHARED}, TRUE)
- cd obj; ${CP} ${soname}.so ${PREFIX}/lib
- cd ${PREFIX}/lib; ${LN} ${soname}.so ${libname}.so
+ cd obj; ${CP} ${soname}.so ${DESTDIR}/${PREFIX}/lib
+ cd ${PREFIX}/lib; ${LN} ${soname}.so ${DESTDIR}/${libname}.so
endif
force:
--- a/Makefile.314.in 2012-12-18 12:09:20.138667591 +0400
+++ b/Makefile.314.in 2012-12-18 12:09:30.408779483 +0400
@@ -1,7 +1,7 @@
PREFIX=@prefix@
BUILD_SHARED=FALSE
RANLIB=@RANLIB@
-
+DESTDIR ?=
MODULES=unicode input_sources sax dom
MAJOR=0
MINOR=8
--- a/Makefile.in 2012-12-18 12:13:04.266473510 +0400
+++ b/Makefile.in 2012-12-18 12:13:51.672353196 +0400
@@ -18,6 +18,7 @@
xmllib=${libdir}/xmlada/${LIBRARY_TYPE}/
docdir=@docdir@
includedir=@includedir@
+ADA_PROJECT_PATH ?=
# Set a default value (ignored if set in the environment)
PROCESSORS?=1
--- a/Makefile.in 2012-12-18 12:14:14.828765183 +0400
+++ b/Makefile.in 2012-12-18 12:16:24.017898234 +0400
@@ -93,27 +93,27 @@
# Rule for installing the modules
%_inst: force
- ${CP} $*/*.ad[bs] ${includedir}/xmlada
- cd $*; ls *.ad[bs] > ${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr
- -cd ${xmllib}; ${CHMOD} ugo+w *.ali
- -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${xmllib}
- ${RM} ${libdir}/libxmlada_$**
- ${RM} ${xmllib}libxmlada_$**
+ ${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada
+ cd $*; ls *.ad[bs] > ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr
+ -cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali
+ -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}/${xmllib}
+ ${RM} ${DESTDIR}/${libdir}/libxmlada_$**
+ ${RM} ${DESTDIR}/${xmllib}libxmlada_$**
ifeq (${LIBRARY_TYPE},static)
- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib}
+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}/${xmllib}
else
ifeq (${OS},Windows_NT)
${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${xmllib}
cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT}
else
- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${xmllib}
- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}
- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION}
+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${DESTDIR}/${xmllib}
+ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}
+ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
+ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
+ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION}
endif
endif
- cd ${xmllib}; ${CHMOD} ugo-w *.ali
+ cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo-w *.ali
install_dirs: force
@${MKDIR} ${DESTDIR}/${bindir}
--- a/Makefile.in 2012-12-18 13:26:25.078354580 +0400
+++ b/Makefile.in 2012-12-18 13:26:51.391700047 +0400
@@ -92,7 +92,7 @@
-${MAKE} -e -C docs html latexpdf
# Rule for installing the modules
-%_inst: force
+%_inst: force install_dirs
${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada
cd $*; ls *.ad[bs] > ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr
-cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali
--- a/Makefile.in 2012-12-18 13:29:37.567920257 +0400
+++ b/Makefile.in 2012-12-18 13:29:52.727119161 +0400
@@ -118,7 +118,7 @@
install_dirs: force
@${MKDIR} ${DESTDIR}/${bindir}
@${MKDIR} ${DESTDIR}/${xmllib}
- @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}xmlada
+ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada
@${MKDIR} ${DESTDIR}/${libdir}
@${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada
@${MKDIR} ${DESTDIR}/${includedir}/xmlada

12
xmlada-4.3-gnatflags.patch Normal file
View file

@ -0,0 +1,12 @@
--- a/Makefile.in 2012-12-18 13:41:48.220640609 +0400
+++ b/Makefile.in 2012-12-18 13:42:11.367941179 +0400
@@ -22,7 +22,8 @@
# Set a default value (ignored if set in the environment)
PROCESSORS?=1
-GNATMAKE=@gnatmake@ -j${PROCESSORS}
+GNATFLAGS ?=
+GNATMAKE=@gnatmake@ ${GNATFLAGS}
# Compiler mode: one of "distrib", "debug", "optimize", "profile", "coverage"
MODE=distrib

94
xmlada-gpr.patch → xmlada-4.3-gpr.patch
View file

@ -1,9 +1,9 @@
--- a/distrib/xmlada_dom.gpr 2011-03-01 12:18:26.928536602 +0300
+++ b/distrib/xmlada_dom.gpr 2011-03-01 12:17:54.631541017 +0300
@@ -1,12 +1,13 @@
+with "directories";
--- a/distrib/xmlada_dom.gpr 2012-12-18 13:53:16.341334269 +0400
+++ b/distrib/xmlada_dom.gpr 2012-12-18 13:54:03.003919628 +0400
@@ -1,12 +1,14 @@
with "xmlada_shared";
with "xmlada_sax";
+with "directories";
project XmlAda_Dom is
for Library_Name use "xmlada_dom";
@ -11,35 +11,36 @@
- for Source_Dirs use ("../../include/xmlada");
+ for Source_Dirs use (Directories.Includedir & "/xmlada");
for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
- for Library_Dir use "../xmlada/" & Project'Library_Kind;
- for Library_Dir use Xmlada_Shared.Libdir;
+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind;
+
for Library_Version use
"lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version;
for Externally_Built use "true";
--- a/distrib/xmlada_sax.gpr 2011-03-01 12:18:26.928536602 +0300
+++ b/distrib/xmlada_sax.gpr 2011-03-01 12:17:54.633540891 +0300
@@ -1,3 +1,4 @@
+with "directories";
--- a/distrib/xmlada_sax.gpr 2012-12-18 13:54:41.931409193 +0400
+++ b/distrib/xmlada_sax.gpr 2012-12-18 13:55:26.489972416 +0400
@@ -1,13 +1,15 @@
with "xmlada_shared";
with "xmlada_input";
+with "directories";
with "xmlada_unicode";
@@ -5,9 +6,9 @@
project XmlAda_Sax is
for Library_Name use "xmlada_sax";
for Library_Kind use Xmlada_Shared.Xmlada_Kind;
- for Source_Dirs use ("../../include/xmlada");
+ for Source_Dirs use (Directories.Includedir & "/xmlada");
for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
- for Library_Dir use "../xmlada/" & Project'Library_Kind;
for Library_Dir use Xmlada_Shared.Libdir;
+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind;
for Library_Version use
"lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version;
for Externally_Built use "true";
--- a/distrib/xmlada_input.gpr 2011-03-01 12:18:26.928536602 +0300
+++ b/distrib/xmlada_input.gpr 2011-03-01 12:17:54.632540953 +0300
@@ -1,12 +1,13 @@
+with "directories";
--- a/distrib/xmlada_input.gpr 2012-12-18 13:55:33.300060354 +0400
+++ b/distrib/xmlada_input.gpr 2012-12-18 13:56:06.452480247 +0400
@@ -1,10 +1,11 @@
with "xmlada_shared";
+with "directories";
with "xmlada_unicode";
project XmlAda_Input is
for Library_Name use "xmlada_input_sources";
@ -48,41 +49,55 @@
- for Source_Dirs use ("../../include/xmlada");
+ for Source_Dirs use (Directories.Includedir & "/xmlada");
for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
- for Library_Dir use "../xmlada/" & Project'Library_Kind;
+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind;
for Library_Dir use Xmlada_Shared.Libdir;
for Library_Version use
"lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version;
for Externally_Built use "true";
--- a/distrib/xmlada.gpr 2011-03-01 12:18:26.928536602 +0300
+++ b/distrib/xmlada.gpr 2011-03-01 12:17:54.632540953 +0300
@@ -1,3 +1,4 @@
--- a/distrib/xmlada.gpr 2012-12-18 13:56:18.460632494 +0400
+++ b/distrib/xmlada.gpr 2012-12-18 13:56:26.696736255 +0400
@@ -5,6 +5,8 @@
with "xmlada_unicode", "xmlada_sax", "xmlada_input", "xmlada_dom";
with "xmlada_schema";
+with "directories";
-- Project file for use of XML/Ada.
-- Put the directory that contains xmlada.gpr in your ADA_PROJECT_PATH
-- variable. Then, in our own project file, add a "with" dependency on
--- a/distrib/xmlada_schema.gpr 2011-03-01 12:18:26.928536602 +0300
+++ b/distrib/xmlada_schema.gpr 2011-03-01 12:17:54.633540891 +0300
@@ -1,12 +1,13 @@
+
project Xmlada is
for Source_Dirs use ();
--- a/distrib/xmlada_shared.gpr.in 2012-12-18 13:56:36.862864254 +0400
+++ b/distrib/xmlada_shared.gpr.in 2012-12-18 13:57:08.059259105 +0400
@@ -1,3 +1,5 @@
+with "directories";
+
project Xmlada_Shared is
for Source_Dirs use ();
Version := "@PACKAGE_VERSION@";
@@ -6,5 +8,5 @@
Xmlada_Kind : Xmlada_Kind_Type := external ("LIBRARY_TYPE", "@DEFAULT_LIBRARY_TYPE@");
-- Location for the dynamic library and ALI files
- Libdir := "../../@LIB@/xmlada/" & Xmlada_Kind;
+ Libdir := Directories.Libdir & "/xmlada/" & Xmlada_Kind;
end Xmlada_Shared;
--- a/distrib/xmlada_schema.gpr 2012-12-18 13:57:29.490530848 +0400
+++ b/distrib/xmlada_schema.gpr 2012-12-18 13:57:48.865776522 +0400
@@ -1,10 +1,11 @@
with "xmlada_shared";
+with "directories";
with "xmlada_dom";
project XmlAda_Schema is
for Library_Name use "xmlada_schema";
for Library_Kind use Xmlada_Shared.Xmlada_Kind;
- for Source_Dirs use ("../../include/xmlada");
+ for Source_Dirs use (Directories.Includedir & "/xmlada");
+ for Source_Dirs use (Directories.Includedir & "/xmlada");
for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
- for Library_Dir use "../xmlada/" & Project'Library_Kind;
+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind;
for Library_Dir use Xmlada_Shared.Libdir;
for Library_Version use
"lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version;
for Externally_Built use "true";
--- a/distrib/xmlada_unicode.gpr 2011-03-01 12:18:26.928536602 +0300
+++ b/distrib/xmlada_unicode.gpr 2011-03-01 12:17:54.633540891 +0300
@@ -1,11 +1,12 @@
+with "directories";
--- a/distrib/xmlada_unicode.gpr 2012-12-18 13:58:00.042917667 +0400
+++ b/distrib/xmlada_unicode.gpr 2012-12-18 13:58:17.724141757 +0400
@@ -1,9 +1,11 @@
with "xmlada_shared";
+with "directories";
+
project XmlAda_Unicode is
for Library_Name use "xmlada_unicode";
@ -90,8 +105,5 @@
- for Source_Dirs use ("../../include/xmlada");
+ for Source_Dirs use (Directories.Includedir & "/xmlada");
for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
- for Library_Dir use "../xmlada/" & Project'Library_Kind;
+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind;
for Library_Dir use Xmlada_Shared.Libdir;
for Library_Version use
"lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version;
for Externally_Built use "true";

26
xmlada.spec
View file

@ -1,6 +1,6 @@
Name: xmlada
Version: 4.1
Release: 4%{?dist}
Version: 4.3
Release: 2%{?dist}
Summary: XML library for Ada
Group: System Environment/Libraries
License: GPLv2+
@ -8,12 +8,12 @@ URL: http://libre.adacore.com
## Direct download link is unavailable
## http://libre.adacore.com/libre/download/
Source0: xmlada-gpl-%{version}-src.tgz
## Fedora-specific
Patch2: %{name}-%{version}-gpr.patch
Patch1: %{name}-%{version}-gnatflags.patch
## Patch for use relocatable libs instead static
## and add DESTDIR option for make install
Patch0: %{name}-%{version}-destdir.patch
## Fedora-specific
Patch1: %{name}-gpr.patch
Patch2: %{name}-%{version}-gnatflags.patch
BuildRequires: chrpath
BuildRequires: gcc-gnat
BuildRequires: fedora-gnat-project-common >= 2
@ -35,7 +35,7 @@ Requires: fedora-gnat-project-common >= 2
Xml library for ada devel package.
%prep
%setup -q -n xmlada-4.1-src
%setup -q -n xmlada-%{version}w-src
%patch0 -p1
%patch1 -p1
%patch2 -p1
@ -65,9 +65,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/*
%files
%defattr(-,root,root,-)
%doc README TODO AUTHORS COPYING
%doc README TODO AUTHORS COPYING*
%dir %{_libdir}/%{name}
%dir %{_docdir}/%{name}
%{_docdir}/%{name}
%dir %{_libdir}/%{name}/relocatable
%dir %{_libdir}/%{name}/static
%{_libdir}/lib%{name}_dom.so.*
@ -76,9 +76,6 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/*
%{_libdir}/lib%{name}_unicode.so.*
%{_libdir}/lib%{name}_sax.so.*
%{_libdir}/%{name}/relocatable/lib%{name}*.so.*
%{_docdir}/%{name}/xml.html
%{_docdir}/%{name}/xml.info
%{_docdir}/%{name}/xml.pdf
@ -106,8 +103,11 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/*
%changelog
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Tue Dec 18 2012 Pavel Zhukov <landgraf@fedoraproject.org> - 4.3-2
- Fix gpr patch
* Mon Dec 17 2012 Pavel Zhukov <landgraf@fedoraproject.org> - 4.3-1
- New release
* Tue Jan 10 2012 Pavel Zhukov <landgraf@fedoraproject.org> - 4.1-3
- Rebuild for new GCC-4.7