[aunit] New release 2013

[Pavel Zhukov]

commit 46940c4c5ddd841a91d5b00cf1420fdc4fb5ef7e
Author: Pavel Zhukov <landgraf at fedoraproject.org>
Date:   Thu Feb 13 10:54:02 2014 +0000

    New release 2013

 .gitignore                                         |    1 +
 ...-2012-destdir.patch => aunit-2013-destdir.patch |    2 +-
 ...rectories.patch => aunit-2013-directories.patch |    0
 ...012-optflags.patch => aunit-2013-optflags.patch |    0
 aunit-2012-shared.patch => aunit-2013-shared.patch |    2 +-
 aunit.spec                                         |   33 +++++++++----------
 sources                                            |    2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c3c9e69..4243ec8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /aunit-gpl-2010-src.tgz
 /aunit-gpl-2012-src.tgz
+/aunit-gpl-2013-src.tgz
diff --git a/aunit-2012-destdir.patch b/aunit-2013-destdir.patch
similarity index 99%
rename from aunit-2012-destdir.patch
rename to aunit-2013-destdir.patch
index 0a95477..fcee464 100644
--- a/aunit-2012-destdir.patch
+++ b/aunit-2013-destdir.patch
@@ -75,7 +75,7 @@
 -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_INC   ?= $(INSTALL)/usr/include/
 +I_LIB   ?= $(INSTALL)/usr/lib/aunit
 +I_GPR   ?= $(INSTALL)/${ADA_PROJECT_PATH}
 +I_TPL   ?= $(INSTALL)/usr/share/aunit/examples
diff --git a/aunit-2012-directories.patch b/aunit-2013-directories.patch
similarity index 100%
rename from aunit-2012-directories.patch
rename to aunit-2013-directories.patch
diff --git a/aunit-2012-optflags.patch b/aunit-2013-optflags.patch
similarity index 100%
rename from aunit-2012-optflags.patch
rename to aunit-2013-optflags.patch
diff --git a/aunit-2012-shared.patch b/aunit-2013-shared.patch
similarity index 96%
rename from aunit-2012-shared.patch
rename to aunit-2013-shared.patch
index e5ea6bf..495d12e 100644
--- a/aunit-2012-shared.patch
+++ b/aunit-2013-shared.patch
@@ -4,7 +4,7 @@
  
  project AUnit_Build is
  
-+   Version := "2012";
++   Version := "2013";
 +
     type Compilation_Mode_Type is
        ("Devel", "Install");
diff --git a/aunit.spec b/aunit.spec
index 0e30885..df4038a 100644
--- a/aunit.spec
+++ b/aunit.spec
@@ -3,22 +3,22 @@
 %define debug_package %{nil}
 
 Name:        aunit
-Version:    2012
-Release:    9%{?dist}
+Version:    2013
+Release:    1%{?dist}
 Summary:    Unit test framework for Ada
 Group:      Development/Languages
-License:    GPLv3+
+License:    GPLv2+
 URL:        http://libre.adacore.com/libre/tools/aunit
 ## No direct download link
 Source0:    aunit-gpl-%{version}-src.tgz
 # Add DESTDIR to make install 
-Patch0:     aunit-2012-destdir.patch
+Patch0:     aunit-2013-destdir.patch
 # Use shared linraries
-Patch1:     aunit-2012-shared.patch
+Patch1:     aunit-2013-shared.patch
 # Remove vendor optflags
-Patch3:     aunit-2012-optflags.patch
+Patch3:     aunit-2013-optflags.patch
 # Fedora specific
-Patch2:     aunit-2012-directories.patch 
+Patch2:     aunit-2013-directories.patch 
 
 
 BuildRequires: fedora-gnat-project-common >= 2     
@@ -50,11 +50,13 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %patch2 -p1
 
 %build
+## Doen't compile without this options
 export GNATFLAGS="%GPRbuild_optflags"
 make %{?_smp_mflags} 
 
 
 %install
+rm -rf %{buildroot}
 export ADA_PROJECT_PATH=%{_GNAT_project_dir}
 make install DESTDIR=%{buildroot}  I_LIB="%{buildroot}/%{_libdir}/"
 ## There is no gps in fedora
@@ -62,15 +64,16 @@ rm -rf %{buildroot}/%{_datadir}/gps/
 chrpath --delete %{buildroot}/%{_libdir}/%{name}/native-full/libaunit.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
-mkdir __doc
-mv  %{buildroot}/%{_datadir}/doc/%{name}/*  __doc
-rm -rf %{buildroot}/%{_datadir}/doc/%{name} 
+
+%clean
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
+%defattr(-,root,root,-)
 %doc COPYING* README
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/native-full
@@ -78,23 +81,19 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
 %{_libdir}/lib%{name}.so.%{version}
 
 %files devel
-%doc __doc/*
+%defattr(-,root,root,-)
+%{_docdir}/%{name}
 %{_libdir}/%{name}/native-full/lib%{name}.so
 %{_libdir}/lib%{name}.so
 %{_libdir}/%{name}/native-full/%{name}*
 %{_libdir}/%{name}/native-full/ada_containers*
 %{_includedir}/%{name}
+%{_datadir}/%{name}
 %{_GNAT_project_dir}/*.gpr
 
 
 
 %changelog
-* Wed Dec 04 2013 Pavel Zhukov <landgraf at fedoraproject.org> - 2012-9
-- Fix packaging issues (#1037967)
-
-* Wed Sep 04 2013 Pavel Zhukov <landgraf at fedoraproject.org> - 2012-7
-- Make docdir unversioned 
-
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 93434f0..d1fbc22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32616bdb1ef4385cb9e199325a7f47ef  aunit-gpl-2012-src.tgz
+97931c34435488feb35ac6aabb740c85  aunit-gpl-2013-src.tgz