SPECS: ApacheDirectoryStudio.spec - added ExclusiveArch - added hack to cd ...

[paszczus]

Author: paszczus                     Date: Wed Feb 18 13:38:56 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added ExclusiveArch
- added hack to cd in proper dir (x86 or x86_64)
- adaptarized

---- Files affected:
SPECS:
   ApacheDirectoryStudio.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/ApacheDirectoryStudio.spec
diff -u SPECS/ApacheDirectoryStudio.spec:1.5 SPECS/ApacheDirectoryStudio.spec:1.6
--- SPECS/ApacheDirectoryStudio.spec:1.5	Wed Feb 18 13:14:58 2009
+++ SPECS/ApacheDirectoryStudio.spec	Wed Feb 18 14:38:50 2009
@@ -11,14 +11,13 @@
 Source0:	%{name}-%{version}-%{_snap}.tar.bz2
 # Source0-md5:	dcb0c4a4be7ee9aefcd71c205d189f51
 URL:		http://directory.apache.org/
-BuildRequires:	maven
 BuildRequires:	java-sun-jre
+BuildRequires:	maven
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	unzip
+ExclusiveArch:	i586 i686 athlon pentium3 pentium4 %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		arch	x86_64
-
 %description
 Apache Directory Studio (formerly known as LDAP Studio) is a complete
 LDAP tooling platform intended to be used with any LDAP server however
@@ -31,19 +30,22 @@
 Servera.
 
 %prep
-%setup -q -n studio 
+%setup -q -n studio
 
 %build
 export M2_HOME="%{_datadir}/maven"
-export JAVA_HOME="/usr/%{_lib}/jvm/java"
+export JAVA_HOME="%{_prefix}/%{_lib}/jvm/java"
 mvn clean install
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_pixmapsdir},%{_desktopdir},%{_bindir}}
 pwd
-install 'tools/Debian Package/package/usr/share/applications/apachedirectorystudio.desktop' $RPM_BUILD_ROOT%{_desktopdir}
-cd target/distributions/%{name}-linux-%{arch}-%{version}-SNAPSHOT
+install 'tools/Debian Package/package%{_datadir}/applications/apachedirectorystudio.desktop' $RPM_BUILD_ROOT%{_desktopdir}
+%if "%{_lib}" == "lib64"
+cd target/distributions/%{name}-linux-x86_64-%{version}-SNAPSHOT
+%else
+cd target/distributions/%{name}-linux-x86-%{version}-SNAPSHOT
 cp -rf configuration $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -rf features $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -rf plugins $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -72,6 +74,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2009/02/18 13:38:50  paszczus
+- added ExclusiveArch
+- added hack to cd in proper dir (x86 or x86_64)
+- adaptarized
+
 Revision 1.5  2009/02/18 12:14:58  paszczus
 - added BR: java-sun-jre and export proper path to java
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ApacheDirectoryStudio.spec?r1=1.5&r2=1.6&f=u