packages: etherpad/etherpad-fix-paths.patch (NEW), etherpad/etherpad.spec (...
glen
glen at pld-linux.org
Fri Oct 15 11:48:29 CEST 2010
Author: glen Date: Fri Oct 15 09:48:29 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- initial pldization from
http://repos.fedorapeople.org/repos/sdz/etherpad/fedora-13/SRPMS/etherpad-0-0.8.20100429.fc13.src.rpm
---- Files affected:
packages/etherpad:
etherpad-fix-paths.patch (NONE -> 1.1) (NEW), etherpad.spec (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/etherpad/etherpad-fix-paths.patch
diff -u /dev/null packages/etherpad/etherpad-fix-paths.patch:1.1
--- /dev/null Fri Oct 15 11:48:29 2010
+++ packages/etherpad/etherpad-fix-paths.patch Fri Oct 15 11:48:23 2010
@@ -0,0 +1,65 @@
+diff -ur a/etherpad/bin/run-local.sh b/etherpad/bin/run-local.sh
+--- a/etherpad/bin/run-local.sh 2009-12-26 04:53:09.000000000 +0100
++++ b/etherpad/bin/run-local.sh 2010-05-12 14:01:48.383977371 +0200
+@@ -14,7 +14,7 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+-mkdir -p data/appjet
++mkdir -p /var/run/etherpad/appjet
+
+ MXRAM="1G"
+ if [ ! -z $1 ]; then
+@@ -24,7 +24,7 @@
+ fi
+ fi
+
+-CP="appjet-eth-dev.jar:data"
++CP="/usr/share/java/etherpad.jar:/var/run/etherpad"
+ for f in lib/*.jar; do
+ CP="$CP:$f"
+ done
+@@ -34,9 +34,9 @@
+ fi
+
+ # etherpad properties file
+-cfg_file=./data/etherpad.local.properties
++cfg_file=/var/run/etherpad/etherpad.local.properties
+ if [ ! -f $cfg_file ]; then
+- cfg_file=./etc/etherpad.localdev-default.properties
++ cfg_file=/etc/etherpad.localdev-default.properties
+ fi
+ if [[ $1 == "--cfg" ]]; then
+ cfg_file=${2}
+@@ -57,7 +57,7 @@
+ -XX:CMSIncrementalSafetyFactor=50 \
+ -XX:+PrintGCDetails \
+ -XX:+PrintGCTimeStamps \
+- -Xloggc:./data/logs/backend/jvm-gc.log \
++ -Xloggc:/var/log/etherpad/backend/jvm-gc.log \
+ -Dappjet.jmxremote=true \
+ $JAVA_OPTS \
+ net.appjet.oui.main \
+diff -ur a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties
+--- a/etherpad/etc/etherpad.localdev-default.properties 2009-12-26 04:53:09.000000000 +0100
++++ b/etherpad/etc/etherpad.localdev-default.properties 2010-05-12 14:05:16.923977495 +0200
+@@ -1,5 +1,5 @@
+-ajstdlibHome = ../infrastructure/framework-src/modules
+-appjetHome = ./data/appjet
++ajstdlibHome = /usr/share/etherpad/framework-src/modules
++appjetHome = /var/run/etherpad/appjet
+ devMode = true
+ etherpad.adminPass = password
+ etherpad.fakeProduction = false
+@@ -9,8 +9,8 @@
+ etherpad.SQL_PASSWORD = password
+ etherpad.SQL_USERNAME = etherpad
+ listen = 9000
+-logDir = ./data/logs
+-modulePath = ./src
++logDir = /var/log/etherpad
++modulePath = /usr/share/etherpad/src
+ transportPrefix = /comet
+ transportUseWildcardSubdomains = true
+-useVirtualFileRoot = ./src
++useVirtualFileRoot = /usr/share/etherpad/src
================================================================
Index: packages/etherpad/etherpad.spec
diff -u /dev/null packages/etherpad/etherpad.spec:1.1
--- /dev/null Fri Oct 15 11:48:29 2010
+++ packages/etherpad/etherpad.spec Fri Oct 15 11:48:23 2010
@@ -0,0 +1,133 @@
+# $Revision$, $Date$
+# TODO
+# - check fedora progress: http://fedoraproject.org/wiki/Etherpad
+#
+# NOTE:
+# tarfile created using hg:
+# hg clone https://etherpad.googlecode.com/hg/ etherpad
+# cd etherpad
+# hg archive --type=tbz2 --prefix=%{name}-%{version} %{name}-%{version}-%{subver}.tar.bz2
+%define subver 20100429
+%define rel 0.1
+Summary: A web-based realtime collaborative document editor
+Name: etherpad
+Version: 0
+Release: 0.%{subver}%{rel}
+License: ASL 2.0
+Group: X11/Applications
+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
+#BuildRequires: jakarta-commons-lang
+#BuildRequires: java(javamail)
+#BuildRequires: java-1.6.0-openjdk-devel >= 1:1.6.0
+#BuildRequires: java-jcommon
+#BuildRequires: java-jfreechart
+#BuildRequires: jetty
+BuildRequires: jpackage-utils
+#BuildRequires: mysql-connector-java >= 5.1.0
+#BuildRequires: mysql-server
+#BuildRequires: scala >= 2.7
+#BuildRequires: tagsoup
+#BuildRequires: tomcat6-servlet-2.5-api
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+Requires: mysql-server
+BuildArch: noarch
+
+%description
+Open source release of EtherPad, a web-based realtime collaborative
+document editor.
+
+%prep
+%setup -qc
+mv etherpad-%{version}/trunk/* .
+%patch0 -p1
+
+# remove backup and git files
+find -name '.gitignore' -exec rm -f '{}' \;
+find -name '*.orig' -exec rm -f '{}' \;
+
+# remove bundled libs and use our own ones
+rm -f etherpad/lib/*
+cp -p %{_javadir}/{dnsjava,jBCrypt,jcommon,jfreechart/jfreechart}.jar etherpad/lib/
+
+# remove as many libs as we can right now
+rm -f infrastructure/lib/{activation,commons-lang-2.4,dnsjava-2.0.6,jetty-6.1.20,jetty-util-6.1.21,mail,servlet-api-2.5-20081211,tagsoup-1.2,yuicompressor-2.4-appjet}.jar
+cp %{_javadir}/{activation,commons-lang,dnsjava,jetty/jetty,jetty/jetty-util,javamail/mail,tomcat6-servlet-2.5-api,tagsoup}.jar infrastructure/lib/
+# find a way to not hardcode the jetty version number here
+cp %{_datadir}/jetty/lib/ext/jetty-sslengine-6.1.21.jar infrastructure/lib/
+
+# rebuild modified yuicompressor instance
+cd infrastructure/yuicompressor && ./make.sh && cd ../../
+
+# adjust file permissions for rpmlint
+chmod a+x infrastructure/bin/compilecache.sh
+chmod a-x etherpad/src/static/js/jquery-1.2.6.js
+
+# don't attempt to use growlnotify
+sed -i -e 's/growlnotify/echo/g' etherpad/bin/rebuildjar.sh
+
+# make sure to use appropriate arguments
+sed -i -e 's/${mysql}/mysql/g' etherpad/bin/setup-mysql-db.sh
+
+%build
+export MYSQL_CONNECTOR_JAR="%{_javadir}/mysql-connector-java.jar"
+export JAVA_HOME="%{_prefix}/java/jdk1.7.0"
+export SCALA_HOME="%{_datadir}/scala"
+cd etherpad
+./bin/rebuildjar.sh
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_javadir}
+cp -p etherpad/appjet-eth-dev.jar $RPM_BUILD_ROOT%{_javadir}/etherpad.jar
+
+install -d $RPM_BUILD_ROOT%{_bindir}
+cp -p etherpad/bin/rebuildjar.sh $RPM_BUILD_ROOT%{_bindir}/etherpad-rebuildjar.sh
+cp -p etherpad/bin/run-local.sh $RPM_BUILD_ROOT%{_bindir}/etherpad-run-local.sh
+cp -p etherpad/bin/setup-mysql-db.sh $RPM_BUILD_ROOT%{_bindir}/etherpad-setup-mysql-db.sh
+
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p etherpad%{_sysconfdir}/etherpad.localdev-default.properties $RPM_BUILD_ROOT%{_sysconfdir}/etherpad.localdev-default.properties
+
+# remove bundled jar files and buildcache
+rm -rf infrastructure/lib infrastructure/build infrastructure/buildcache
+
+# create directories for run-local script
+install -d $RPM_BUILD_ROOT%{_localstatedir}/log/etherpad
+install -d $RPM_BUILD_ROOT%{_localstatedir}/run/etherpad
+
+install -d $RPM_BUILD_ROOT%{_datadir}/etherpad
+cp -pr etherpad/src infrastructure/* $RPM_BUILD_ROOT%{_datadir}/etherpad
+
+# remove zero lengths files
+find $RPM_BUILD_ROOT -size 0 | xargs rm -v
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc COPYING README
+%config(noreplace) %{_sysconfdir}/etherpad.localdev-default.properties
+%attr(755,root,root) %{_bindir}/etherpad-*.sh
+%{_datadir}/etherpad
+%{_javadir}/etherpad.jar
+
+%dir %{_localstatedir}/log/etherpad
+%dir %{_localstatedir}/run/etherpad
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+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
================================================================
More information about the pld-cvs-commit
mailing list