Changeset 978


Ignore:
Timestamp:
08/21/15 10:28:03 (6 years ago)
Author:
olahaye
Message:

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

Location:
branches/1.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.2/Makefile

    r977 r978  
    7777        @ls -1 ../jobmonarch*$(VERSION)*.deb
    7878
    79 install:  ${REQUIRED}
     79install:  install-files install-perms
     80
     81install-files:  ${REQUIRED}
    8082        @#
    8183        @# Set the correct GANGLIA_PATH.
     
    154156        @echo "Installing Ganglia web interface to $(GANGLIA_ROOT) ."
    155157        @install -m 0755 -d $(DESTDIR)$(GANGLIA_ROOT)
    156         @chown -R $(GANGLIA_USER) ./web
    157         @chown $(HTTPD_USER) ./web/addons/job_monarch/dwoo/compiled
    158         @chown $(HTTPD_USER) ./web/addons/job_monarch/dwoo/cache
    159158        @chmod 775 ./web/addons/job_monarch/dwoo/cache
    160159        @(cd web; rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php ./addons ./templates $(DESTDIR)$(GANGLIA_ROOT)/)
     
    163162        @echo "Installation complete."
    164163        @echo
     164
     165install-perms:
     166        @chown -R $(GANGLIA_USER) $(DESTDIR)$(GANGLIA_ROOT)
     167        @chown $(HTTPD_USER) $(DESTDIR)$(GANGLIA_ROOT)/addons/job_monarch/dwoo/compiled
     168        @chown $(HTTPD_USER) $(DESTDIR)$(GANGLIA_ROOT)/addons/job_monarch/dwoo/cache
    165169
    166170clean:
  • branches/1.2/pkg/rpm/jobmonarch.spec

    r977 r978  
    138138
    139139# Install files in RPM_BUILD_ROOT
    140 fakeroot %__make install \
     140%__make install-files \
    141141        PREFIX=/usr \
    142142        GANGLIA_ROOT=%{gangliaroot} \
     
    265265
    266266%files -n jobmonarch-jobmond
     267%defattr(644,root,root,755)
    267268%doc jobmond/examples
    268269%doc AUTHORS CHANGELOG INSTALL LICENSE README TODO UPGRADE
     
    278279
    279280%files -n jobmonarch-jobarchived
     281%defattr(644,root,root,755)
    280282%doc jobarchived/examples
    281283%doc AUTHORS CHANGELOG INSTALL LICENSE README TODO UPGRADE
     
    294296
    295297%files -n jobmonarch-webfrontend
     298%defattr(644,%{ganglia_user},%{ganglia_user},755)
    296299%doc AUTHORS CHANGELOG INSTALL LICENSE README TODO UPGRADE
    297300%dir %{gangliatemplatedir}/job_monarch
     
    378381%{gangliaaddonsdir}/job_monarch/dwoo/plugins/builtin/functions/count_words.php
    379382%{gangliaaddonsdir}/job_monarch/dwoo/plugins/builtin/functions/date_format.php
    380 %dir %attr(775,apache,apache) %{gangliaaddonsdir}/job_monarch/dwoo/compiled
    381 %dir %attr(775,apache,apache) %{gangliaaddonsdir}/job_monarch/dwoo/cache
    382383%dir %{gangliaaddonsdir}/job_monarch/dwoo/Dwoo
    383384%{gangliaaddonsdir}/job_monarch/dwoo/Dwoo/IPluginProxy.php
     
    462463%{gangliaaddonsdir}/job_monarch/ts_validatetime.js
    463464%{gangliaaddonsdir}/job_monarch/version.php
     465%dir %attr(775,%{httpd_user},%{httpd_user}) %{gangliaaddonsdir}/job_monarch/dwoo/compiled
     466%dir %attr(775,%{httpd_user},%{httpd_user}) %{gangliaaddonsdir}/job_monarch/dwoo/cache
    464467
    465468%changelog
     469* Fri Aug 21 2015 Olivier Lahaye <olivier.lahaye@free.fr> 1.2.0-1
     470- Avoid using fakeroot to build rpm package by only using install-files rule
     471  and use %defattr nd %attr to set correct file permissions.
     472
    466473* Fri Jul 04 2014 Olivier Lahaye <olivier.lahaye@free.fr> 1.1.3-2
    467474- Replace --with that doesn't support value assigment in latest
     
    486493- removed jobmond dep from webfrontend pkg
    487494
    488 %changelog
    489495* Wed Apr 24 2013 Olivier Lahaye <olivier.lahaye@free.fr> 1.0-3
    490496- Use make install to install the files
Note: See TracChangeset for help on using the changeset viewer.