rpms/piccolo2d/devel piccolo2d.spec,1.7,1.8

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/piccolo2d/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21582/devel

Modified Files:
	piccolo2d.spec 
Log Message:
- Create both x86 and x86_64 symlinks to allow properly building the package as noarch.


Index: piccolo2d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/devel/piccolo2d.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- piccolo2d.spec	24 Mar 2010 21:33:45 -0000	1.7
+++ piccolo2d.spec	14 May 2010 14:48:04 -0000	1.8
@@ -1,12 +1,6 @@
-%ifarch %{ix86}
-%global eclipse_arch    x86
-%else
-%global eclipse_arch   %{_arch}
-%endif
-
 Name:           piccolo2d
 Version:        1.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Structured 2D graphics toolkit
 
 Group:          Development/Libraries
@@ -16,23 +10,22 @@ URL:            http://code.google.com/p
 Source0:        http://piccolo2d.googlecode.com/files/%{name}-%{version}-src.tar.gz
 Source2:        %{name}-settings.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  maven-plugin-bundle
 BuildRequires:  maven2-plugin-assembly
-BuildRequires:  maven2-plugin-install >= 2.0.8
-BuildRequires:  maven2-plugin-compiler >= 2.0.8
-BuildRequires:  maven2-plugin-javadoc >= 2.0.8
-BuildRequires:  maven2-plugin-jar >= 2.0.8
-BuildRequires:  maven2-plugin-resources >= 2.0.8
+BuildRequires:  maven2-plugin-install 
+BuildRequires:  maven2-plugin-compiler 
+BuildRequires:  maven2-plugin-javadoc 
+BuildRequires:  maven2-plugin-jar 
+BuildRequires:  maven2-plugin-resources 
 BuildRequires:  maven-surefire-maven-plugin 
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-doxia-sitetools
-BuildRequires:  java-1.6.0-openjdk-devel
+BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  eclipse-swt
 
 Requires: eclipse-swt
 
-
+BuildArch: noarch
 
 %description
 A revolutionary way to create robust, full-featured graphical
@@ -50,7 +43,8 @@ API documentation for %{name}.
 %setup -q -n piccolo2d-%{version}-src
 
 mkdir -p .m2/repository/org.eclipse.swt.gtk.linux/
-ln -s %{_libdir}/java/swt.jar .m2/repository/org.eclipse.swt.gtk.linux/%{eclipse_arch}.jar  
+ln -s %{_libdir}/java/swt.jar .m2/repository/org.eclipse.swt.gtk.linux/x86.jar  
+ln -s %{_libdir}/java/swt.jar .m2/repository/org.eclipse.swt.gtk.linux/x86_64.jar 
 
 mkdir external_repo
 ln -s %{_javadir} external_repo/JPP
@@ -130,6 +124,9 @@ ln -s %{name}-%{version} %{buildroot}%{_
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri May 14 2010 Alexander Kurtakov <akurtako at redhat.com> 1.3-5
+- Create both x86 and x86_64 symlinks to allow properly building the package as noarch.
+
 * Wed Mar 24 2010 Alexander Kurtakov <akurtako at redhat.com> 1.3-4
 - More maven BRs.