Author: paszczus Date: Mon Nov 2 12:17:59 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- added .desktop file
- added Source3 for PPC binaries
- switched to main apache.org server instead of polish mirror
---- Files affected:
packages/ApacheDirectoryStudio:
ApacheDirectoryStudio.spec (1.8 -> 1.9)
---- Diffs:
================================================================
Index: packages/ApacheDirectoryStudio/ApacheDirectoryStudio.spec
diff -u packages/ApacheDirectoryStudio/ApacheDirectoryStudio.spec:1.8
packages/ApacheDirectoryStudio/ApacheDirectoryStudio.spec:1.9
--- packages/ApacheDirectoryStudio/ApacheDirectoryStudio.spec:1.8 Mon Nov
2 12:42:20 2009
+++ packages/ApacheDirectoryStudio/ApacheDirectoryStudio.spec Mon Nov 2
13:17:54 2009
@@ -8,14 +8,16 @@
Release: 0.%{_reldate}.1
License: Apache
Group: Applications
-Source0:
http://www.apache.net.pl/directory/studio/stable/%{version}.v%{_reldate}/%{name}-linux-x86-%{version}.v%{_reldate}.tar.gz
+Source0:
http://www.apache.org/dist/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:
http://www.apache.org/dist/directory/studio/stable/%{version}.v%{_reldate}/%{name}-linux-x86_64-%{version}.v%{_reldate}.tar.gz
# Source1-md5: 38c037ebaa0999efe1e3fcce61e3ed50
+Source2:
http://www.apache.org/dist/directory/studio/stable/%{version}.v%{_reldate}/%{name}-linux-ppc-%{version}.v%{_reldate}.tar.gz
+# Source2-md5: c16a9f50e270c3fd053336eb72c6f4b8
+Source3: apachedirectorystudio.desktop
URL: http://directory.apache.org/
BuildRequires: rpmbuild(macros) >= 1.300
-Requires: java-sun
-ExclusiveArch: i586 i686 athlon pentium3 pentium4 %{x8664}
+ExclusiveArch: %{ix86} %{x8664} ppc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -31,17 +33,22 @@
%prep
%ifarch %{ix86}
-%setup -q -n %{name}-linux-x86-%{version}.v%{_reldate}
-%else
-%setup -q -b1 -n %{name}-linux-x86_64-%{version}.v%{_reldate}
+%setup -q -b1 -b2 -n %{name}-linux-x86-%{version}.v%{_reldate}
+%endif
+%ifarch %{x8664}
+%setup -q -b1 -b2 -n %{name}-linux-x86_64-%{version}.v%{_reldate}
+%endif
+%ifarch ppc
+%setup -q -b1 -b2 -n %{name}-linux-ppc-%{version}.v%{_reldate}
%endif
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_pixmapsdir},%{_bindir}}
+install -d
$RPM_BUILD_ROOT{%{_datadir}/%{name},%{_pixmapsdir},%{_desktopdir},%{_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}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/
ln -s %{_datadir}/%{name}/%{name}
$RPM_BUILD_ROOT%{_bindir}/apachedirectorystudio
%clean
@@ -57,6 +64,7 @@
%{_datadir}/%{name}/features
%{_datadir}/%{name}/plugins
%{_pixmapsdir}/ApacheDirectoryStudio.xpm
+%{_desktopdir}/apachedirectorystudio.desktop
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -64,6 +72,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.9 2009/11/02 12:17:54 paszczus
+- added .desktop file
+- added Source3 for PPC binaries
+- switched to main apache.org server instead of polish mirror
+
Revision 1.8 2009/11/02 11:42:20 paszczus
- updated to 1.4.0v20090407
- switched do binaries instead of maven
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ApacheDirectoryStudio/ApacheDirectoryStudio.spec?r1=1.8&r2=1.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
