[gprbuild] New release (2013) Removed devel package

Pavel Zhukov landgraf at fedoraproject.org
Sat Jul 13 17:06:51 UTC 2013 

commit 4d5481be570ef09b03b77805dd9ab5907e8a5717
Author: Pavel Zhukov <pzhukov at redhat.com>
Date:   Sat Jul 13 19:06:14 2013 +0200

    New release (2013)
    Removed devel package

 .gitignore                                         |    1 +
 gprbuild-2012-destdir.patch                        |   60 -----------
 gprbuild-2013-destdir.patch                        |  110 ++++++++++++++++++++
 ...rpath.patch => gprbuild-2013-remove_rpath.patch |    0
 ...d-2012-style.patch => gprbuild-2013-style.patch |    0
 ...12-usrmove.patch => gprbuild-2013-usrmove.patch |    0
 gprbuild.spec                                      |   24 ++---
 sources                                            |    2 +-
 8 files changed, 120 insertions(+), 77 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a7d035b..653728e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /gprbuild-gpl-2010-src.tgz
 /gprbuild-gpl-2011-src.tgz
 /gprbuild-gpl-2012-src.tgz
+/gprbuild-gpl-2013-src.tgz
diff --git a/gprbuild-2013-destdir.patch b/gprbuild-2013-destdir.patch
new file mode 100644
index 0000000..2d3b5dc
--- /dev/null
+++ b/gprbuild-2013-destdir.patch
@@ -0,0 +1,110 @@
+--- a/Makefile.in	2013-07-13 11:55:44.870791362 +0200
++++ b/Makefile.in	2013-07-13 12:00:43.106782490 +0200
+@@ -21,6 +21,7 @@
+ MKDIR=mkdir -p
+ BUILD=production
+ 
++DESTDIR ?= 
+ prefix=@prefix@
+ srcdir=@srcdir@
+ root_objdir=@objdir@
+@@ -37,7 +38,7 @@
+ xmlada_prj_flags=@xmlada_prj_flags@
+ 
+ # How do we want to use XML/Ada ?
+-LIBRARY_TYPE=static
++LIBRARY_TYPE=relocatable
+ export LIBRARY_TYPE
+ 
+ objdir=obj
+@@ -124,45 +125,45 @@
+ 	  -XBUILD_TOOL=gprbuild
+ 
+ install: install.data install.bin
+-	-${MKDIR} ${datadir}/gpr
+-	$(RM) -r ${datadir}/examples/gprbuild
+-	-${MKDIR} ${datadir}/examples/gprbuild
+-	${CP} -r examples/* ${datadir}/examples/gprbuild
+-	${RM} -r ${datadir}/doc/gprbuild
+-	-${MKDIR} ${datadir}/doc/gprbuild
++	-${MKDIR} ${DESTDIR}/${datadir}/gpr
++	$(RM) -r ${DESTDIR}/${datadir}/doc/gprbuild/examples
++	-${MKDIR} ${DESTDIR}/${datadir}/doc/gprbuild/examples/
++	${CP} -r examples/* ${DESTDIR}/${datadir}/doc/gprbuild/examples/
++	${RM} -r ${DESTDIR}/${datadir}/doc/gprbuild
++	-${MKDIR} ${DESTDIR}/${datadir}/doc/gprbuild
+ 	for format in html txt pdf info; do \
+ 	  if [ -d doc/$$format ] ; then \
+-	     ${MKDIR} ${datadir}/doc/gprbuild/$$format; \
+-	     ${CP} doc/$$format/* ${datadir}/doc/gprbuild/$$format; \
++	     ${MKDIR} ${DESTDIR}/${datadir}/doc/gprbuild/$$format; \
++	     ${CP} doc/$$format/* ${DESTDIR}/${datadir}/doc/gprbuild/$$format; \
+ 	     if [ $$format = html ] ; then \
+-	        ${CP} doc/*.png ${datadir}/doc/gprbuild/html; \
++	        ${CP} doc/*.png ${DESTDIR}/${datadir}/doc/gprbuild/html; \
+ 	        sed -e "s/<doc_path>.*//" doc/gprbuild_gps.xml \
+-	           > ${datadir}/doc/gprbuild/html/gps_index.xml; \
++	           > ${DESTDIR}/${datadir}/doc/gprbuild/html/gps_index.xml; \
+ 	     fi; \
+ 	  fi; \
+ 	done
+ 
+ install.data: force
+-	-${MKDIR} ${datadir}/gprconfig
+-	${CP} share/gprconfig/*.xml ${datadir}/gprconfig
+-	${CP} share/gprconfig/gprconfig.xsd ${datadir}/gprconfig
+-	-${MKDIR} ${datadir}/gpr
+-	${CP} share/_default.gpr ${datadir}/gpr
++	-${MKDIR} ${DESTDIR}/${datadir}/gprconfig
++	${CP} share/gprconfig/*.xml ${DESTDIR}/${datadir}/gprconfig
++	${CP} share/gprconfig/gprconfig.xsd ${DESTDIR}/${datadir}/gprconfig
++	-${MKDIR} ${DESTDIR}/${datadir}/gpr
++	${CP} share/_default.gpr ${DESTDIR}/${datadir}/gpr
+ 
+ install.bin: force
+-	-${MKDIR} ${bindir}
+-	${INSTALL_PROGRAM} gprconfig${EXEXT} ${bindir}
+-	${INSTALL_PROGRAM} gprbuild${EXEXT} ${bindir}
+-	${INSTALL_PROGRAM} gprclean${EXEXT} ${bindir}
+-	${INSTALL_PROGRAM} gprinstall${EXEXT} ${bindir}
++	-${MKDIR} ${DESTDIR}/${bindir}
++	${INSTALL_PROGRAM} gprconfig${EXEXT} ${DESTDIR}/${bindir}
++	${INSTALL_PROGRAM} gprbuild${EXEXT} ${DESTDIR}/${bindir}
++	${INSTALL_PROGRAM} gprclean${EXEXT} ${DESTDIR}/${bindir}
++	${INSTALL_PROGRAM} gprinstall${EXEXT} ${DESTDIR}/${bindir}
+ ifeq ($(IS_WINDOWS),true)
+ 	${CP} src/gprinstall.exe.manifest ${bindir}
+ 	chmod +x ${bindir}/gprinstall.exe.manifest
+ endif
+-	${INSTALL_PROGRAM} gprslave${EXEXT} ${bindir}
+-	-${MKDIR} ${libexecdir}/gprbuild
+-	${INSTALL_PROGRAM} gprbind${EXEXT} ${libexecdir}/gprbuild/
+-	${INSTALL_PROGRAM} gprlib${EXEXT} ${libexecdir}/gprbuild/
++	${INSTALL_PROGRAM} gprslave${EXEXT} ${DESTDIR}/${bindir}
++	-${MKDIR} ${DESTDIR}/${libexecdir}/gprbuild
++	${INSTALL_PROGRAM} gprbind${EXEXT} ${DESTDIR}/${libexecdir}/gprbuild/
++	${INSTALL_PROGRAM} gprlib${EXEXT} ${DESTDIR}/${libexecdir}/gprbuild/
+ 
+ $(objdir)/gprbuild_dummies.o: src/gprbuild_dummies.c
+ 	gcc -c -o $@ $<
+@@ -193,8 +194,8 @@
+ 	make -C doc
+ 
+ install-doc:
+-	-$(MKDIR) ${docdir}/html
+-	${CP} doc/*.html ${docdir}/html
++	-$(MKDIR) ${DESTDIR}/${docdir}/html
++	${CP} doc/*.html ${DESTDIR}/${docdir}/html
+ 
+ tests: force
+ 	cd internal/gprtests_python; python ./run-gprconfig-test.py
+--- a/Makefile.in	2013-07-13 12:11:57.502762429 +0200
++++ b/Makefile.in	2013-07-13 12:12:16.930761851 +0200
+@@ -129,7 +129,6 @@
+ 	$(RM) -r ${DESTDIR}/${datadir}/doc/gprbuild/examples
+ 	-${MKDIR} ${DESTDIR}/${datadir}/doc/gprbuild/examples/
+ 	${CP} -r examples/* ${DESTDIR}/${datadir}/doc/gprbuild/examples/
+-	${RM} -r ${DESTDIR}/${datadir}/doc/gprbuild
+ 	-${MKDIR} ${DESTDIR}/${datadir}/doc/gprbuild
+ 	for format in html txt pdf info; do \
+ 	  if [ -d doc/$$format ] ; then \
diff --git a/gprbuild-2012-remove_rpath.patch b/gprbuild-2013-remove_rpath.patch
similarity index 100%
rename from gprbuild-2012-remove_rpath.patch
rename to gprbuild-2013-remove_rpath.patch
diff --git a/gprbuild-2012-style.patch b/gprbuild-2013-style.patch
similarity index 100%
rename from gprbuild-2012-style.patch
rename to gprbuild-2013-style.patch
diff --git a/gprbuild-2012-usrmove.patch b/gprbuild-2013-usrmove.patch
similarity index 100%
rename from gprbuild-2012-usrmove.patch
rename to gprbuild-2013-usrmove.patch
diff --git a/gprbuild.spec b/gprbuild.spec
index 7de6720..745e3d6 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -1,6 +1,6 @@
 Name:       gprbuild
-Version:    2012
-Release:    4%{?dist}
+Version:    2013
+Release:    1%{?dist}
 Summary:    Ada project builder
 Group:      Development/Languages
 License:    GPLv2+
@@ -32,18 +32,10 @@ Easily extendable by users to cover new toolchains and languages
 it is primarily aimed at projects of all sizes organized into subsystems
 and libraries and is particularly well-suited for compiled languages.
 
-%package devel
-Summary:    Devel package for gprbuild
-License:    GPLv2
-Group:      Development/Languages
-Requires:   %{name} = %{version}-%{release}
-
-%description devel
-Devel package (examples) for gprbuild
 
 %prep
 %setup -q -n %{name}-%{version}-src
-%patch0 -p1 
+##%%patch0 -p1 
 %patch1 -p1 
 %patch3 -p1 
 %patch6 -p1 
@@ -59,7 +51,7 @@ mkdir -p %{buildroot}%{_docdir}/%{name}
 install -m0644 README %{buildroot}%{_docdir}/%{name}/
 install -m0644 COPYING* %{buildroot}%{_docdir}/%{name}/
 install -m0644 CHANGE*   %{buildroot}%{_docdir}/%{name}/
-find %{buildroot}%{_datadir}/%{name}/examples -type f -exec chmod -x {} \;
+find %{buildroot}%{_docdir}/%{name}/examples -type f -exec chmod -x {} \;
 find %{buildroot}%{_datadir}/gprconfig -type f -name "*.xml" -exec chmod -x {} \;
 mv -f %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{name}-%{version}
 
@@ -71,12 +63,12 @@ mv -f %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{name}-%{version}
 %{_libexecdir}/%{name}/gpr*
 %dir %{_datadir}/gprconfig
 %{_datadir}/gprconfig/*
-
-%files devel
-%defattr(-,root,root,-)
-%{_datadir}/%{name}/examples/*
+%_GNAT_project_dir/*
 
 %changelog
+* Sat Jul 13 2013  Pavel Zhukov <landgraf at fedoraproject.org> - 2013-1
+- New release (2013)
+
 * Fri Jan 25 2013   Pavel Zhukov <landgraf at fedoraproject.org> - 2012-4
 - Rebuild with GCC 4.8 
 
diff --git a/sources b/sources
index ccaa41f..c8b9160 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39878830ff317045434b9df8872ad4e3  gprbuild-gpl-2012-src.tgz
+f97cfb8b1dba3a10a9de1ef4d71117f8  gprbuild-gpl-2013-src.tgz

More information about the scm-commits mailing list