- noarch

Changed files:
    eclipse-emf-sdo-xsd.spec -> 1.14

diff --git a/eclipse-emf-sdo-xsd.spec b/eclipse-emf-sdo-xsd.spec
index fd20183f08f4e3083fe4807a66c191fe52df75c1..f29b8581e70f73e4a2a05ec07f2892419bd614aa 100644 (file)
--- a/eclipse-emf-sdo-xsd.spec
+++ b/eclipse-emf-sdo-xsd.spec
@@ -1,24 +1,25 @@
-# TODO
-# - build noarch
-
 %define                module  emf-sdo-xsd
-%define                buildid 200802051830
+%include       /usr/lib/rpm/macros.java
 Summary:       Eclipse Modeling Framework
 Summary(pl.UTF-8):     Eclipse Modeling Framework - szkielet do modelowania w Eclipse
 Name:          eclipse-%{module}
 Version:       2.3.2
-Release:       1
+Release:       2
 License:       EPL v1.0
 Group:         Development/Tools
-Source0:       http://download.eclipse.org/modeling/emf/emf/downloads/drops/%{version}/R%{buildid}/%{module}-SDK-%{version}.zip
+Source0:       http://download.eclipse.org/modeling/emf/emf/downloads/drops/%{version}/R200802051830/%{module}-SDK-%{version}.zip
 # Source0-md5: da937bf8e31788d5121176581b286a43
 URL:           http://www.eclipse.org/emf/
+BuildRequires: jpackage-utils
+BuildRequires: rpm-javaprov
+BuildRequires: rpmbuild(macros) >= 1.300
 BuildRequires: unzip
 Requires:      eclipse >= 3.2
 Obsoletes:     eclipse-emf-sdo
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _eclipsedir     %{_libdir}/eclipse
+%define                eclipsedir      %{_datadir}/eclipse
 
 %description
 Eclipse Modeling Framework (EMF).
@@ -31,16 +32,16 @@ Eclipse Modeling Framework (EMF) - szkielet do modelowania w Eclipse.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_eclipsedir}/{features,plugins}
-cp -rf eclipse/features/* $RPM_BUILD_ROOT%{_eclipsedir}/features
-cp -rf eclipse/plugins/* $RPM_BUILD_ROOT%{_eclipsedir}/plugins
+install -d $RPM_BUILD_ROOT%{eclipsedir}/{features,plugins}
+cp -a eclipse/features/* $RPM_BUILD_ROOT%{eclipsedir}/features
+cp -a eclipse/plugins/* $RPM_BUILD_ROOT%{eclipsedir}/plugins
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_eclipsedir}/features/org.eclipse.emf*
-%{_eclipsedir}/features/org.eclipse.xsd*
-%{_eclipsedir}/plugins/org.eclipse.emf*
-%{_eclipsedir}/plugins/org.eclipse.xsd*
+%{eclipsedir}/features/org.eclipse.emf*
+%{eclipsedir}/features/org.eclipse.xsd*
+%{eclipsedir}/plugins/org.eclipse.emf*
+%{eclipsedir}/plugins/org.eclipse.xsd*