Changeset 977 for branches/1.2

Timestamp:

08/21/15 09:24:21 (9 years ago)

Author:

olahaye

Message:

[rpm packaging] Update web prefix dir default to match ganglia packaging in rhel/fedora world

Location:

branches/1.2

Files:

• Makefile (modified) (1 diff)
• pkg/rpm/jobmonarch.spec (modified) (2 diffs)

branches/1.2/Makefile

@@ -65 +65 @@
 rpm: tarball-bzip
         # Binary package will reflect most distro where ganglia default location is /usr/share/ganglia
-        @LC_ALL=C rpmbuild -tb --define 'web_prefixdir /usr/share/ganglia-webfrontend' ../ganglia_jobmonarch-${VERSION}.tar.bz2|grep "Wrote: "
+        @LC_ALL=C rpmbuild -tb --define 'web_prefixdir /usr/share/ganglia' ../ganglia_jobmonarch-${VERSION}.tar.bz2|grep "Wrote: "
 
 srpm: tarball-bzip

branches/1.2/pkg/rpm/jobmonarch.spec

@@ -5 +5 @@
 #   --define 'ganglia_user <username>'     # defaults to: ganglia
 #   --define 'ganglia_group <group>'       # defaults to: ganglia
-#   --define 'web_prefixdir <path>'        # defaults to: /usr/share/ganglia-webfrontend
+#   --define 'web_prefixdir <path>'        # defaults to: /usr/share/ganglia
 
 # example: rpmbuild -tb jobmonarch-1.1.2.tar.gz --define 'httpd_user www-data' --define 'httpd_group www-data' --define 'web_prefixdir /srv/www/ganglia'
@@ -13 +13 @@
 %{!?web_prefixdir: %define web_prefixdir /srv/www/htdocs/ganglia}
 %else
-%{!?web_prefixdir: %define web_prefixdir /usr/share/ganglia-webfrontend}
+%{!?web_prefixdir: %define web_prefixdir /usr/share/ganglia}
 %endif