Commit: 2f3d81d04efd68f7a9c05e8e67e33e302f99f5bd - grrreader (git)

Simple RSS Reader inspired by Gxxgle Reader

Commit MetaInfo

• Revision: 2f3d81d04efd68f7a9c05e8e67e33e302f99f5bd (tree)
• Time: 2013-07-16 02:11:19
• Author: hylom <hylom@hylo...>
• Commiter: hylom

Log Message

dist: fix spec and makefile

Change Summary

• modified: dist/Makefile
• modified: dist/grrreader.spec
• modified: initscript

Incremental Difference

--- a/dist/Makefile
+++ b/dist/Makefile
@@ -28,3 +28,4 @@ $(TGZ_NAME):
 clean:
 	rm -rf rpmbuild
 	rm -f $(TGZ_NAME)
+	rm -f grrreader-$(VERSION)-*.rpm

--- a/dist/grrreader.spec
+++ b/dist/grrreader.spec
@@ -11,11 +11,11 @@ Source0: http://hylom.net/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-Requires: nodejs >= 0.10.0
+Requires: nodejs >= 0.8.0
 Requires: python >= 2.6.6
 Requires: python-dateutil >= 1.4.1
 Requires: python-feedparser >= 5.1.2
-Requires: /usr/lib/node_modules/forever/bin/forever
+#Requires: /usr/bin/forever
 Requires: bash
 
 %description
@@ -23,7 +23,8 @@ Grrreader is HTML and Ajax based RSS Reader application based on Node.js and Pyt
 
 %prep
 %setup
-sed -i -e 's/\/var\/grrreader\/app.js/\/usr\/share\/grrreader\/app.js/' initscript 
+sed -i -e 's/^TARGET_SCRIPT.*$/TARGET_SCRIPT=\/usr\/share\/grrreader\/client\/app.js/' initscript 
+
 
 %build
 cd client; npm install
@@ -39,6 +40,9 @@ install -m 755 initscript ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/grrreader
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%preun
+/etc/init.d/grrreader stop
+
 %files
 %defattr(-, root, root, -)
 %doc README.md

--- a/initscript
+++ b/initscript
@@ -8,7 +8,7 @@
 
 
 DAEMON_NAME=grrreader
-TARGET_SCRIPT=/var/grrreader/app.js
+TARGET_SCRIPT=/var/grrreader/client/app.js
 LOGFILE=/var/log/${DAEMON_NAME}.log
 STDOUTFILE=/var/log/${DAEMON_NAME}.out
 ERRORFILE=/var/log/${DAEMON_NAME}.err