[xmlada/f15/master] Fix libdir problem

Pavel Zhukov landgraf at fedoraproject.org
Sat Mar 5 08:59:17 UTC 2011


commit b13b308b0d90b142a78d7bc227034480111def4e
Author: Pavel Zhukov <pavel at zhukoff.net>
Date:   Sat Mar 5 11:58:24 2011 +0300

    Fix libdir problem

 xmlada-gpr.patch |   10 +++++-----
 xmlada.spec      |   17 ++++++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/xmlada-gpr.patch b/xmlada-gpr.patch
index fde55ea..74384fe 100644
--- a/xmlada-gpr.patch
+++ b/xmlada-gpr.patch
@@ -12,7 +12,7 @@
 +    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 Directories.Libdir & "/xmlada/" & Project'Library_Kind;
      for Library_Version use
         "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version;
      for Externally_Built use "true";
@@ -31,7 +31,7 @@
 +    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 Directories.Libdir & "/xmlada/" & Project'Library_Kind;
      for Library_Version use
         "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version;
      for Externally_Built use "true";
@@ -49,7 +49,7 @@
 +    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 Directories.Libdir & "/xmlada/" & Project'Library_Kind;
      for Library_Version use
         "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version;
      for Externally_Built use "true";
@@ -74,7 +74,7 @@
 +    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 Directories.Libdir & "/xmlada/" & Project'Library_Kind;
      for Library_Version use
         "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version;
      for Externally_Built use "true";
@@ -91,7 +91,7 @@
 +    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 Directories.Libdir & "/xmlada/" & Project'Library_Kind;
      for Library_Version use
         "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version;
      for Externally_Built use "true";
diff --git a/xmlada.spec b/xmlada.spec
index 034ed3f..5d95cb0 100644
--- a/xmlada.spec
+++ b/xmlada.spec
@@ -1,6 +1,6 @@
 Name:       	xmlada
 Version:    	3.2.1
-Release:    	9%{?dist}
+Release:    	10%{?dist}
 Summary:    	XML library for Ada
 Group:      	System Environment/Libraries
 License:    	GPLv2+
@@ -102,6 +102,9 @@ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py*
 
 
 %changelog
+* Tue Mar 01 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 3.2.1-10
+- fix path for fedora-gnat-project-common
+
 * Tue Mar 01 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 3.2.1-9
 - use macros _GNAT_project_di
 - fix hardcode includedir
@@ -109,24 +112,24 @@ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py*
 - fix owned dir
 - fix ?_isa
 
-* Sun Feb 20 2011 Pavel Zhukov <pavel at zhukoff.net> - 3.2.1-8
+* Sun Feb 20 2011 Pavel Zhukov <landgraf at fedoraproject.com> - 3.2.1-8
 - fix spec errors
 - fix directories for rawhide
 - fix gcc-4.6 issues
 - fix libdir
 
-* Fri Feb 11 2011 Pavel Zhukov <pavel at zhukoff.net> - 3.2.1-6
+* Fri Feb 11 2011 Pavel Zhukov <landgraf at fedoraproject.com> - 3.2.1-6
 - move gpr to /usr/share/gpr(/xmlada)
 
-* Mon Feb 7 2011 Pavel Zhukov <pavel at zhukoff.net> - 3.2.1-5
+* Mon Feb 7 2011 Pavel Zhukov <landgraf at fedoraproject.com> - 3.2.1-5
 - move so to -devel package fix spec errors
 
-* Sun Feb 6 2011 Pavel Zhukov <pavel at zhukoff.net> - 3.2.1-4
+* Sun Feb 6 2011 Pavel Zhukov <landgraf at fedoraproject.com> - 3.2.1-4
 - fix dir owner
 
-* Sat Feb 5 2011 Pavel Zhukov <pavel at zhukoff.net> - 3.2.1-3
+* Sat Feb 5 2011 Pavel Zhukov <landgraf at fedoraproject.com> - 3.2.1-3
 - fix errors in Makefile
 - fix files list 
 
-* Fri Feb 4 2011 Pavel Zhukov <pavel at zhukoff.net> - 3.2.1-1
+* Fri Feb 4 2011 Pavel Zhukov <landgraf at fedoraproject.com> - 3.2.1-1
 - Initial spec


More information about the scm-commits mailing list