diff options
| author | Sławomir Paszkiewicz | 2009-02-18 13:38:50 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 3d49f50d4f000ef8104f75a71605f915c2641d46 (patch) | |
| tree | 9d8bae76ad7cfe4f67f011de5d5f5d1f9a881fec /ApacheDirectoryStudio.spec | |
| parent | 6afb3bc3f62d25b419b560d3b3d34f92a3822307 (diff) | |
| download | ApacheDirectoryStudio-3d49f50d4f000ef8104f75a71605f915c2641d46.zip ApacheDirectoryStudio-3d49f50d4f000ef8104f75a71605f915c2641d46.tar.gz | |
- added ExclusiveArch
- added hack to cd in proper dir (x86 or x86_64)
- adaptarized
Changed files:
ApacheDirectoryStudio.spec -> 1.6
Diffstat (limited to 'ApacheDirectoryStudio.spec')
| -rw-r--r-- | ApacheDirectoryStudio.spec | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ApacheDirectoryStudio.spec b/ApacheDirectoryStudio.spec index a2dc076..60d9ece 100644 --- a/ApacheDirectoryStudio.spec +++ b/ApacheDirectoryStudio.spec @@ -10,14 +10,13 @@ Group: Applications 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 @@ -30,19 +29,22 @@ serwerem LDAP, jednak jest najlepiej dopasowana do Apache Directory 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} |