rpms/PragmARC/F-12 PragmARC.spec, 1.1, 1.2 build_pragmarc.gpr, 1.1, 1.2

[Björn Persson]

Author: rombobeorn

Update of /cvs/pkgs/rpms/PragmARC/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11907/F-12

Modified Files:
	PragmARC.spec build_pragmarc.gpr 
Log Message:
Resolved a conflict between debuginfo packages.



Index: PragmARC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PragmARC/F-12/PragmARC.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- PragmARC.spec	1 Nov 2009 17:46:26 -0000	1.1
+++ PragmARC.spec	5 Nov 2009 02:16:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           PragmARC
 Version:        20060427
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        PragmAda Reusable Components, a component library for Ada
 Summary(sv):    PragmAda Reusable Components, ett komponentbibliotek för ada
 
@@ -48,6 +48,8 @@ cp -p %{SOURCE2} pragmarc.gpr
 %build
 # Prepare build target directories.
 mkdir --parents build_target%{_includedir}/pragmarc build_target%{_libdir}/pragmarc
+# Prepare a subdirectory to put the binder file in.
+mkdir %{_arch}
 # Delete files that won't be used.
 rm compile_all.adb assertion_handler.adb
 # Compile the library.
@@ -90,6 +92,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Nov 03 2009 Björn Persson <bjorn at rombobjörn.se> - 20060427-6
+- Resolved a conflict between debuginfo packages.
+
 * Fri Oct 30 2009 Björn Persson <bjorn at rombobjörn.se> - 20060427-5
 - Removed a symlink correction that isn't needed in Fedora 11 and later.
 


Index: build_pragmarc.gpr
===================================================================
RCS file: /cvs/pkgs/rpms/PragmARC/F-12/build_pragmarc.gpr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- build_pragmarc.gpr	1 Nov 2009 17:46:27 -0000	1.1
+++ build_pragmarc.gpr	5 Nov 2009 02:16:52 -0000	1.2
@@ -19,6 +19,10 @@ project PragmARC is
    for Library_Dir     use Build_Target & "/usr/" & Common.Lib;
    for Library_ALI_Dir use Build_Target & "/usr/" & Common.Lib & "/pragmarc";
 
+   -- Put the binder files for different architectures in subdirectories where
+   -- they won't conflict with each other.
+   for Object_Dir use Common.HARDWARE_PLATFORM;
+
    for Library_Interface use
            ("PragmARC",
             "PragmARC.Ansi_Tty_Control",