Changeset 978 for branches/1.2

Timestamp:

08/21/15 10:28:03 (9 years ago)

Author:

olahaye

Message:

[rpm build] Avoid using fakeroot to build rpm packages.

Location:

branches/1.2

Files:

• Makefile (modified) (3 diffs)
• pkg/rpm/jobmonarch.spec (modified) (7 diffs)

branches/1.2/Makefile

@@ -77 +77 @@
         @ls -1 ../jobmonarch*$(VERSION)*.deb
 
-install:  ${REQUIRED}
+install:  install-files install-perms
+
+install-files:  ${REQUIRED}
         @#
         @# Set the correct GANGLIA_PATH.
@@ -154 +156 @@
         @echo "Installing Ganglia web interface to $(GANGLIA_ROOT) ."
         @install -m 0755 -d $(DESTDIR)$(GANGLIA_ROOT)
-        @chown -R $(GANGLIA_USER) ./web
-        @chown $(HTTPD_USER) ./web/addons/job_monarch/dwoo/compiled
-        @chown $(HTTPD_USER) ./web/addons/job_monarch/dwoo/cache
         @chmod 775 ./web/addons/job_monarch/dwoo/cache
         @(cd web; rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php ./addons ./templates $(DESTDIR)$(GANGLIA_ROOT)/)
@@ -163 +162 @@
         @echo "Installation complete."
         @echo
+
+install-perms:
+        @chown -R $(GANGLIA_USER) $(DESTDIR)$(GANGLIA_ROOT)
+        @chown $(HTTPD_USER) $(DESTDIR)$(GANGLIA_ROOT)/addons/job_monarch/dwoo/compiled
+        @chown $(HTTPD_USER) $(DESTDIR)$(GANGLIA_ROOT)/addons/job_monarch/dwoo/cache
 
 clean:

branches/1.2/pkg/rpm/jobmonarch.spec

@@ -138 +138 @@
 
 # Install files in RPM_BUILD_ROOT
-fakeroot %__make install \
+%__make install-files \
         PREFIX=/usr \
         GANGLIA_ROOT=%{gangliaroot} \
@@ -265 +265 @@
 
 %files -n jobmonarch-jobmond
+%defattr(644,root,root,755)
 %doc jobmond/examples
 %doc AUTHORS CHANGELOG INSTALL LICENSE README TODO UPGRADE
@@ -278 +279 @@
 
 %files -n jobmonarch-jobarchived
+%defattr(644,root,root,755)
 %doc jobarchived/examples
 %doc AUTHORS CHANGELOG INSTALL LICENSE README TODO UPGRADE
@@ -294 +296 @@
 
 %files -n jobmonarch-webfrontend
+%defattr(644,%{ganglia_user},%{ganglia_user},755)
 %doc AUTHORS CHANGELOG INSTALL LICENSE README TODO UPGRADE
 %dir %{gangliatemplatedir}/job_monarch
@@ -378 +381 @@
 %{gangliaaddonsdir}/job_monarch/dwoo/plugins/builtin/functions/count_words.php
 %{gangliaaddonsdir}/job_monarch/dwoo/plugins/builtin/functions/date_format.php
-%dir %attr(775,apache,apache) %{gangliaaddonsdir}/job_monarch/dwoo/compiled
-%dir %attr(775,apache,apache) %{gangliaaddonsdir}/job_monarch/dwoo/cache
 %dir %{gangliaaddonsdir}/job_monarch/dwoo/Dwoo
 %{gangliaaddonsdir}/job_monarch/dwoo/Dwoo/IPluginProxy.php
@@ -462 +463 @@
 %{gangliaaddonsdir}/job_monarch/ts_validatetime.js
 %{gangliaaddonsdir}/job_monarch/version.php
+%dir %attr(775,%{httpd_user},%{httpd_user}) %{gangliaaddonsdir}/job_monarch/dwoo/compiled
+%dir %attr(775,%{httpd_user},%{httpd_user}) %{gangliaaddonsdir}/job_monarch/dwoo/cache
 
 %changelog
+* Fri Aug 21 2015 Olivier Lahaye <olivier.lahaye@free.fr> 1.2.0-1
+- Avoid using fakeroot to build rpm package by only using install-files rule
+  and use %defattr nd %attr to set correct file permissions.
+
 * Fri Jul 04 2014 Olivier Lahaye <olivier.lahaye@free.fr> 1.1.3-2
 - Replace --with that doesn't support value assigment in latest
@@ -486 +493 @@
 - removed jobmond dep from webfrontend pkg
 
-%changelog
 * Wed Apr 24 2013 Olivier Lahaye <olivier.lahaye@free.fr> 1.0-3
 - Use make install to install the files