- updated to 1.4.0v20090407

- switched do binaries instead of maven

Changed files:
    ApacheDirectoryStudio.spec -> 1.8

diff --git a/ApacheDirectoryStudio.spec b/ApacheDirectoryStudio.spec
index a55d257cacf2f82844dff77657497f812b0953e9..c1ddcb3c5076d25f68adb5ecd6857f713148287a 100644 (file)
--- a/ApacheDirectoryStudio.spec
+++ b/ApacheDirectoryStudio.spec
@@ -1,19 +1,19 @@
 #
-%define        _snap   745477
+%define     _reldate    20090407
 Summary:       Apache Directory Studio - LDAP tooling platform
 Summary(pl.UTF-8):     Apache Directory Studio - platforma narzędzi LDAP
 Name:          ApacheDirectoryStudio
 Version:       1.4.0
-Release:       0.%{_snap}.1
+Release:       0.%{_reldate}.1
 License:       Apache
 Group:         Applications
-Source0:       %{name}-%{version}-%{_snap}.tar.bz2
-# Source0-md5: dcb0c4a4be7ee9aefcd71c205d189f51
+Source0:       http://www.apache.net.pl/directory/studio/stable/%{version}.v%{_reldate}/%{name}-linux-x86-%{version}.v%{_reldate}.tar.gz
+# Source0-md5: 3bc4b96993eab40f8429893087f0430e
+Source1:       http://www.apache.net.pl/directory/studio/stable/%{version}.v%{_reldate}/%{name}-linux-x86_64-%{version}.v%{_reldate}.tar.gz
+# Source1-md5: 38c037ebaa0999efe1e3fcce61e3ed50
 URL:           http://directory.apache.org/
-BuildRequires: java-sun-jre
-BuildRequires: maven
 BuildRequires: rpmbuild(macros) >= 1.300
-BuildRequires: unzip
+Requires:      java-sun
 ExclusiveArch: i586 i686 athlon pentium3 pentium4 %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,28 +29,18 @@ serwerem LDAP, jednak jest najlepiej dopasowana do Apache Directory
 Servera.
 
 %prep
-%setup -q -n studio
-
-%build
-export M2_HOME="%{_datadir}/maven"
-export JAVA_HOME="%{_prefix}/%{_lib}/jvm/java"
-mvn clean install
+%ifarch %{ix86}
+%setup -q -n %{name}-linux-x86-%{version}.v%{_reldate}
+%else
+%setup -q -b1 -n %{name}-linux-x86_64-%{version}.v%{_reldate}
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_pixmapsdir},%{_desktopdir},%{_bindir}}
-pwd
-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
-%endif
-cp -rf configuration $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -rf features $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -rf plugins $RPM_BUILD_ROOT%{_datadir}/%{name}
-install ApacheDirectoryStudio $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_pixmapsdir},%{_bindir}}
+cp -a {configuration,features,plugins} $RPM_BUILD_ROOT%{_datadir}/%{name}
 install ApacheDirectoryStudio.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
+install ApacheDirectoryStudio $RPM_BUILD_ROOT%{_datadir}/%{name}
 ln -s %{_datadir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}/apachedirectorystudio
 
 %clean
@@ -58,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc NOTICE.txt docs/Release\ Notes.txt
+%doc NOTICE.txt Release\ Notes.txt
 %attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/%{name}
 %attr(755,root,root) %{_datadir}/%{name}/ApacheDirectoryStudio
@@ -66,4 +56,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/features
 %{_datadir}/%{name}/plugins
 %{_pixmapsdir}/ApacheDirectoryStudio.xpm
-%{_desktopdir}/apachedirectorystudio.desktop