[aunit] New release 2012
Pavel Zhukov
landgraf at fedoraproject.org
Tue Dec 18 11:20:34 UTC 2012
commit 0f8654ffb009618c68b448ebda4273b2b7a1442f
Author: Pavel Zhukov <pavel at zhukoff.net>
Date: Tue Dec 18 15:20:27 2012 +0400
New release 2012
.gitignore | 1 +
aunit-2010-libdir.patch | 19 ---
aunit-2010-makefile.patch | 74 ----------
aunit-2012-destdir.patch | 140 ++++++++++++++++++++
...rectories.patch => aunit-2012-directories.patch | 28 ++---
aunit-2012-optflags.patch | 24 ++++
aunit-2012-shared.patch | 23 ++++
aunit-optflags.patch | 13 --
aunit.spec | 41 +++----
sources | 2 +-
10 files changed, 217 insertions(+), 148 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b30e41d..c3c9e69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/aunit-gpl-2010-src.tgz
+/aunit-gpl-2012-src.tgz
diff --git a/aunit-2012-destdir.patch b/aunit-2012-destdir.patch
new file mode 100644
index 0000000..0a95477
--- /dev/null
+++ b/aunit-2012-destdir.patch
@@ -0,0 +1,140 @@
+--- a/Makefile 2012-12-18 14:37:30.235076000 +0400
++++ b/Makefile 2012-12-18 14:38:19.039705258 +0400
+@@ -3,7 +3,8 @@
+ GPRBUILD = gprbuild
+ GPRCLEAN = gprclean
+
+-INSTALL:=$(shell exec=`which gprbuild`;if [ ! -x "$$exec" ]; then unset exec;fi;echo $$exec | sed -e 's/\/bin\/$(GPRBUILD).*//')
++DESTDIR ?=
++INSTALL ?= ${DESTDIR}
+
+ ifeq ($(RTS),)
+ RTS=full
+--- a/Makefile 2012-12-18 14:42:07.194647510 +0400
++++ b/Makefile 2012-12-18 14:43:25.342652766 +0400
+@@ -73,7 +73,8 @@
+ done
+ -$(CP) support/aunit.xml $(I_PLG)
+
+- -$(CPR) lib/gnat lib/aunit $(INSTALL)/lib
++ -$(CPR) lib/gnat $(INSTALL)/${ADA_PROJECT_PATH}
++ -$(CPR) lib/aunit $(INSTALL)/${libdir}
+ -$(CPR) include/aunit $(INSTALL)/include
+ -$(CPR) share/examples $(INSTALL)/share
+ @echo '------------------------------------------------------------------'
+--- a/Makefile 2012-12-18 14:43:57.903074436 +0400
++++ b/Makefile 2012-12-18 14:45:40.415399574 +0400
+@@ -3,6 +3,7 @@
+ GPRBUILD = gprbuild
+ GPRCLEAN = gprclean
+
++libdir ?= /usr/local/lib
+ DESTDIR ?=
+ INSTALL ?= ${DESTDIR}
+
+@@ -26,12 +27,12 @@
+
+ # Install directories
+
+-I_INC = $(INSTALL)/include/aunit
+-I_LIB = $(INSTALL)/lib/aunit
+-I_GPR = $(INSTALL)/lib/gnat
+-I_TPL = $(INSTALL)/share/examples/aunit
+-I_DOC = $(INSTALL)/share/doc/aunit
+-I_PLG = $(INSTALL)/share/gps/plug-ins
++I_INC = $(INSTALL)/usr/include/aunit
++I_LIB = $(INSTALL)/${libdir}/aunit
++I_GPR = $(INSTALL)/${ADA_PROJECT_PATH}
++I_TPL = $(INSTALL)/usr/share/aunit/examples
++I_DOC = $(INSTALL)/usr/share/doc/aunit
++I_PLG = $(INSTALL)/usr/share/gps/plug-ins
+
+ .PHONY: all clean targets install_clean install
+
+--- a/Makefile 2012-12-18 14:45:58.920638398 +0400
++++ b/Makefile 2012-12-18 14:46:06.257732858 +0400
+@@ -28,7 +28,7 @@
+ # Install directories
+
+ I_INC = $(INSTALL)/usr/include/aunit
+-I_LIB = $(INSTALL)/${libdir}/aunit
++I_LIB ?= $(INSTALL)/${libdir}/aunit
+ I_GPR = $(INSTALL)/${ADA_PROJECT_PATH}
+ I_TPL = $(INSTALL)/usr/share/aunit/examples
+ I_DOC = $(INSTALL)/usr/share/doc/aunit
+
+--- a/Makefile 2012-12-18 14:52:19.969066713 +0400
++++ b/Makefile 2012-12-18 14:52:43.749340964 +0400
+@@ -27,12 +27,12 @@
+
+ # Install directories
+
+-I_INC = $(INSTALL)/usr/include/aunit
+-I_LIB ?= $(INSTALL)/${libdir}/aunit
+-I_GPR = $(INSTALL)/${ADA_PROJECT_PATH}
+-I_TPL = $(INSTALL)/usr/share/aunit/examples
+-I_DOC = $(INSTALL)/usr/share/doc/aunit
+-I_PLG = $(INSTALL)/usr/share/gps/plug-ins
++I_INC ?= $(INSTALL)/usr/include/aunit
++I_LIB ?= $(INSTALL)/usr/lib/aunit
++I_GPR ?= $(INSTALL)/${ADA_PROJECT_PATH}
++I_TPL ?= $(INSTALL)/usr/share/aunit/examples
++I_DOC ?= $(INSTALL)/usr/share/doc/aunit
++I_PLG ?= $(INSTALL)/usr/share/gps/plug-ins
+
+ .PHONY: all clean targets install_clean install
+
+--- a/Makefile 2012-12-18 14:52:56.866496369 +0400
++++ b/Makefile 2012-12-18 14:53:49.150105794 +0400
+@@ -33,6 +33,7 @@
+ I_TPL ?= $(INSTALL)/usr/share/aunit/examples
+ I_DOC ?= $(INSTALL)/usr/share/doc/aunit
+ I_PLG ?= $(INSTALL)/usr/share/gps/plug-ins
++I_DAT ?= $(INSTALL)/usr/share
+
+ .PHONY: all clean targets install_clean install
+
+@@ -75,9 +76,9 @@
+ -$(CP) support/aunit.xml $(I_PLG)
+
+ -$(CPR) lib/gnat $(INSTALL)/${ADA_PROJECT_PATH}
+- -$(CPR) lib/aunit $(INSTALL)/${libdir}
+- -$(CPR) include/aunit $(INSTALL)/include
+- -$(CPR) share/examples $(INSTALL)/share
++ -$(CPR) lib/aunit $(I_LIB)
++ -$(CPR) include/aunit $(I_INC)
++ -$(CPR) share/examples $(I_DAT)
+ @echo '------------------------------------------------------------------'
+ @echo '-- AUnit has now been installed.'
+ @echo '-- To be able to use the library, you may need to update your'
+--- a/Makefile 2012-12-18 14:54:15.556419351 +0400
++++ b/Makefile 2012-12-18 14:54:38.164686043 +0400
+@@ -33,7 +33,7 @@
+ I_TPL ?= $(INSTALL)/usr/share/aunit/examples
+ I_DOC ?= $(INSTALL)/usr/share/doc/aunit
+ I_PLG ?= $(INSTALL)/usr/share/gps/plug-ins
+-I_DAT ?= $(INSTALL)/usr/share
++I_DA ?= $(INSTALL)/usr/share
+
+ .PHONY: all clean targets install_clean install
+
+@@ -78,7 +78,7 @@
+ -$(CPR) lib/gnat $(INSTALL)/${ADA_PROJECT_PATH}
+ -$(CPR) lib/aunit $(I_LIB)
+ -$(CPR) include/aunit $(I_INC)
+- -$(CPR) share/examples $(I_DAT)
++ -$(CPR) share/examples $(I_DAT)/aunit
+ @echo '------------------------------------------------------------------'
+ @echo '-- AUnit has now been installed.'
+ @echo '-- To be able to use the library, you may need to update your'
+--- a/Makefile 2012-12-18 15:02:04.588129891 +0400
++++ b/Makefile 2012-12-18 15:02:24.251373785 +0400
+@@ -75,7 +75,7 @@
+ done
+ -$(CP) support/aunit.xml $(I_PLG)
+
+- -$(CPR) lib/gnat $(INSTALL)/${ADA_PROJECT_PATH}
++ -$(CPR) lib/gnat/* $(INSTALL)/${ADA_PROJECT_PATH}
+ -$(CPR) lib/aunit $(I_LIB)
+ -$(CPR) include/aunit $(I_INC)
+ -$(CPR) share/examples $(I_DAT)/aunit
diff --git a/aunit-directories.patch b/aunit-2012-directories.patch
similarity index 57%
rename from aunit-directories.patch
rename to aunit-2012-directories.patch
index e63e0f6..967d5d0 100644
--- a/aunit-directories.patch
+++ b/aunit-2012-directories.patch
@@ -1,25 +1,11 @@
---- a/support/aunit.gpr 2010-06-04 14:21:25.000000000 +0400
-+++ b/support/aunit.gpr 2011-03-25 22:26:20.841001221 +0300
-@@ -1,20 +1,23 @@
-+with "directories";
+--- a/lib/gnat/aunit.gpr 2012-12-18 15:15:55.430433200 +0400
++++ b/lib/gnat/aunit.gpr 2012-12-18 15:16:44.485044711 +0400
+@@ -1,18 +1,19 @@
with "aunit_shared";
++with "directories";
project AUnit is
-- for Library_Dir use
-- "../../lib/aunit/" & AUnit_Shared.Target & "-" & AUnit_Shared.Runtime;
-+for Library_Dir use
-+ Directories.Libdir & "/aunit/" & AUnit_Shared.Target & "-" & AUnit_Shared.Runtime;
-
-- for Library_Name use "aunit";
-- for Library_Kind use "static";
-- for Externally_Built use "true";
-+ for Library_Name use "aunit";
-+ for Library_Kind use "relocatable";
-+ for Library_Version use
-+ "lib" & Project'Library_Name & ".so." & Version;
-+ for Externally_Built use "true";
-
for Source_Dirs use
- ("../../include/aunit/framework",
- "../../include/aunit/containers",
@@ -34,4 +20,10 @@
+ Directories.Includedir & "/aunit/framework/" & AUnit_Shared.Calend,
+ Directories.Includedir & "/aunit/framework/" & AUnit_Shared.Memory);
+ for Library_Dir use AUnit_Shared.Library_Dir;
+ for Library_Name use "aunit";
+- for Library_Kind use "static";
++ for Library_Kind use "relocatable";
+ for Externally_Built use "true";
+
end AUnit;
diff --git a/aunit-2012-optflags.patch b/aunit-2012-optflags.patch
new file mode 100644
index 0000000..dd465a8
--- /dev/null
+++ b/aunit-2012-optflags.patch
@@ -0,0 +1,24 @@
+--- a/Makefile 2012-12-18 15:04:04.452628949 +0400
++++ b/Makefile 2012-12-18 15:05:07.789420167 +0400
+@@ -1,6 +1,7 @@
+ RTS =
+ TARGET =
+-GPRBUILD = gprbuild
++GNATFLAGS ?=
++GPRBUILD = gprbuild ${GNATFLAGS}
+ GPRCLEAN = gprclean
+
+ libdir ?= /usr/local/lib
+--- a/Makefile 2012-12-18 15:07:41.141303720 +0400
++++ b/Makefile 2012-12-18 15:07:47.377380514 +0400
+@@ -24,7 +24,9 @@
+
+ MODE = Install
+
+-CONF_ARGS = $(TARGET_CONF) $(RTS_CONF)
++## CONF_ARGS = $(TARGET_CONF) $(RTS_CONF)
++CONF_ARGS = ${GNATFLAGS}
++
+
+ # Install directories
+
diff --git a/aunit-2012-shared.patch b/aunit-2012-shared.patch
new file mode 100644
index 0000000..e5ea6bf
--- /dev/null
+++ b/aunit-2012-shared.patch
@@ -0,0 +1,23 @@
+--- a/lib/gnat/aunit_build.gpr 2012-12-18 14:57:58.401099526 +0400
++++ b/lib/gnat/aunit_build.gpr 2012-12-18 14:59:01.734871937 +0400
+@@ -2,6 +2,8 @@
+
+ project AUnit_Build is
+
++ Version := "2012";
++
+ type Compilation_Mode_Type is
+ ("Devel", "Install");
+ Mode : Compilation_Mode_Type := external ("MODE", "Install");
+@@ -20,7 +22,10 @@
+ for Object_Dir use Obj_Dir;
+
+ for Library_Name use "aunit";
+- for Library_Kind use "static";
++ for Library_Kind use "relocatable";
++ for Library_Version use
++ "lib" & Project'Library_Name & ".so." & Version;
++
+
+ package Compiler is
+ case Mode is
diff --git a/aunit.spec b/aunit.spec
index 828a6d5..958c65e 100644
--- a/aunit.spec
+++ b/aunit.spec
@@ -3,22 +3,22 @@
%define debug_package %{nil}
Name: aunit
-Version: 2011
-Release: 3%{?dist}
+Version: 2012
+Release: 1%{?dist}
Summary: Unit test framework for Ada
Group: Development/Languages
License: GPLv2+
URL: http://libre.adacore.com/libre/tools/aunit
## No direct download link
-Source0: aunit-gpl-2010-src.tgz
+Source0: aunit-gpl-%{version}-src.tgz
# Add DESTDIR to make install
-Patch0: aunit-2010-makefile.patch
+Patch0: aunit-2012-destdir.patch
# Use shared linraries
-Patch1: aunit-2010-libdir.patch
-# Fedora specific
-Patch2: aunit-directories.patch
+Patch1: aunit-2012-shared.patch
# Remove vendor optflags
-Patch3: aunit-optflags.patch
+Patch3: aunit-2012-optflags.patch
+# Fedora specific
+Patch2: aunit-2012-directories.patch
BuildRequires: fedora-gnat-project-common >= 2
@@ -43,27 +43,26 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%{summary}
%prep
-%setup -q -n aunit-gpl-2010-src
+%setup -q -n aunit-gpl-%{version}-src
%patch0 -p1
%patch1 -p1
+%patch3 -p1
%patch2 -p1
-%patch3 -p1
%build
## Doen't compile without this options
-export GNATFLAGS="%{GNAT_optflags} -cargs -fno-strict-aliasing "
-make
-## make %{?_smp_mflags}
+export GNATFLAGS="%GPRbuild_optflags"
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
export ADA_PROJECT_PATH=%{_GNAT_project_dir}
-make install DESTDIR=$RPM_BUILD_ROOT I_LIB="%{buildroot}/%{_libdir}/%{name}/"
+make install DESTDIR=$RPM_BUILD_ROOT I_LIB="%{buildroot}/%{_libdir}/"
## There is no gps in fedora
rm -rf %{buildroot}/%{_datadir}/gps/
chrpath --delete %{buildroot}/%{_libdir}/%{name}/native-full/libaunit.so.%{version}
-ln -s %{_libdir}/%{name}/native-full/lib%{name}.so.2010 %{buildroot}/%{_libdir}/lib%{name}.so.%{version}
+ln -s %{_libdir}/%{name}/native-full/lib%{name}.so.%{version} %{buildroot}/%{_libdir}/lib%{name}.so.%{version}
ln -s %{_libdir}/%{name}/native-full/lib%{name}.so %{buildroot}/%{_libdir}/lib%{name}.so
%clean
@@ -75,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING* README
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/native-full
%{_libdir}/%{name}/native-full/lib%{name}.so.%{version}
@@ -90,17 +89,13 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/%{name}/native-full/ada_containers*
%{_includedir}/%{name}
%{_datadir}/%{name}
-%{_GNAT_project_dir}/%{name}.gpr
-%{_GNAT_project_dir}/%{name}_shared.gpr
+%{_GNAT_project_dir}/*.gpr
%changelog
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2011-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Mar 10 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2011-2
-- Rebuild for new gprbuild
+* Tue Dec 18 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2012-1
+- New release 2012
* Sun Mar 04 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2011-1
- Update to 2011
diff --git a/sources b/sources
index 45e3192..93434f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7281d6b98a35ef474d46afb0c40da66d aunit-gpl-2010-src.tgz
+32616bdb1ef4385cb9e199325a7f47ef aunit-gpl-2012-src.tgz
More information about the scm-commits
mailing list