• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javac++androidlinuxc#windowsobjective-cqtcocoa誰得pythonphprubygameguibathyscaphec翻訳計画中(planning stage)omegatframeworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Simple RSS Reader inspired by Gxxgle Reader


コミットメタ情報

リビジョン2f3d81d04efd68f7a9c05e8e67e33e302f99f5bd (tree)
日時2013-07-16 02:11:19
作者hylom <hylom@hylo...>
コミッターhylom

ログメッセージ

dist: fix spec and makefile

変更サマリ

差分

--- a/dist/Makefile
+++ b/dist/Makefile
@@ -28,3 +28,4 @@ $(TGZ_NAME):
2828 clean:
2929 rm -rf rpmbuild
3030 rm -f $(TGZ_NAME)
31+ 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
1111 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
1212 BuildArch: noarch
1313
14-Requires: nodejs >= 0.10.0
14+Requires: nodejs >= 0.8.0
1515 Requires: python >= 2.6.6
1616 Requires: python-dateutil >= 1.4.1
1717 Requires: python-feedparser >= 5.1.2
18-Requires: /usr/lib/node_modules/forever/bin/forever
18+#Requires: /usr/bin/forever
1919 Requires: bash
2020
2121 %description
@@ -23,7 +23,8 @@ Grrreader is HTML and Ajax based RSS Reader application based on Node.js and Pyt
2323
2424 %prep
2525 %setup
26-sed -i -e 's/\/var\/grrreader\/app.js/\/usr\/share\/grrreader\/app.js/' initscript
26+sed -i -e 's/^TARGET_SCRIPT.*$/TARGET_SCRIPT=\/usr\/share\/grrreader\/client\/app.js/' initscript
27+
2728
2829 %build
2930 cd client; npm install
@@ -39,6 +40,9 @@ install -m 755 initscript ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/grrreader
3940 %clean
4041 rm -rf ${RPM_BUILD_ROOT}
4142
43+%preun
44+/etc/init.d/grrreader stop
45+
4246 %files
4347 %defattr(-, root, root, -)
4448 %doc README.md
--- a/initscript
+++ b/initscript
@@ -8,7 +8,7 @@
88
99
1010 DAEMON_NAME=grrreader
11-TARGET_SCRIPT=/var/grrreader/app.js
11+TARGET_SCRIPT=/var/grrreader/client/app.js
1212 LOGFILE=/var/log/${DAEMON_NAME}.log
1313 STDOUTFILE=/var/log/${DAEMON_NAME}.out
1414 ERRORFILE=/var/log/${DAEMON_NAME}.err