packages: etherpad/etherpad.spec - mysql server may be remote, just suggest...

[glen]

Author: glen                         Date: Fri Oct 15 09:51:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mysql server may be remote, just suggest server
- java version dependency via java macros, not implicit
- pld config attrs

---- Files affected:
packages/etherpad:
   etherpad.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/etherpad/etherpad.spec
diff -u packages/etherpad/etherpad.spec:1.1 packages/etherpad/etherpad.spec:1.2
--- packages/etherpad/etherpad.spec:1.1	Fri Oct 15 11:48:23 2010
+++ packages/etherpad/etherpad.spec	Fri Oct 15 11:51:42 2010
@@ -9,6 +9,7 @@
 # hg archive --type=tbz2 --prefix=%{name}-%{version} %{name}-%{version}-%{subver}.tar.bz2
 %define		subver	20100429
 %define		rel		0.1
+%include	/usr/lib/rpm/macros.java
 Summary:	A web-based realtime collaborative document editor
 Name:		etherpad
 Version:	0
@@ -18,7 +19,6 @@
 URL:		http://code.google.com/p/etherpad/
 Source0:	%{name}-%{version}-%{subver}.tar.bz2
 # Source0-md5:	3dd182ec529c56f36ebcfe089389a7ac
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Patch0:		%{name}-fix-paths.patch
 #BuildRequires:	dnsjava
 #BuildRequires:	jBCrypt
@@ -31,13 +31,15 @@
 BuildRequires:	jpackage-utils
 #BuildRequires:	mysql-connector-java >= 5.1.0
 #BuildRequires:	mysql-server
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.546
 #BuildRequires:	scala >= 2.7
 #BuildRequires:	tagsoup
 #BuildRequires:	tomcat6-servlet-2.5-api
-Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
-Requires:	mysql-server
+Suggests:	mysql
 BuildArch:	noarch
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Open source release of EtherPad, a web-based realtime collaborative
@@ -114,7 +116,7 @@
 %files
 %defattr(644,root,root,755)
 %doc COPYING README
-%config(noreplace) %{_sysconfdir}/etherpad.localdev-default.properties
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/etherpad.localdev-default.properties
 %attr(755,root,root) %{_bindir}/etherpad-*.sh
 %{_datadir}/etherpad
 %{_javadir}/etherpad.jar
@@ -128,6 +130,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/10/15 09:51:42  glen
+- mysql server may be remote, just suggest server
+- java version dependency via java macros, not implicit
+- pld config attrs
+
 Revision 1.1  2010/10/15 09:48:23  glen
 - initial pldization from
   http://repos.fedorapeople.org/repos/sdz/etherpad/fedora-13/SRPMS/etherpad-0-0.8.20100429.fc13.src.rpm
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/etherpad/etherpad.spec?r1=1.1&r2=1.2&f=u