Author: baggins Date: Fri Oct 7 09:23:58 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- simplify build and install
---- Files affected:
SPECS:
munin.spec (1.12 -> 1.13)
---- Diffs:
================================================================
Index: SPECS/munin.spec
diff -u SPECS/munin.spec:1.12 SPECS/munin.spec:1.13
--- SPECS/munin.spec:1.12 Thu Oct 6 23:48:12 2005
+++ SPECS/munin.spec Fri Oct 7 11:23:51 2005
@@ -15,8 +15,7 @@
# Source0-md5: 9eef4a53626cee0e088391c5deb8bd51
Source1: %{name}-node.init
Source2: %{name}.cron
-Source3: %{name}-Makefile.config
-Source4: %{name}-apache.conf
+Source3: %{name}-apache.conf
Patch0: %{name}-Makefile.patch
URL: http://munin.sourceforge.net/
BuildRequires: htmldoc
@@ -88,30 +87,22 @@
%prep
%setup -q
%patch0 -p1
-install -m644 %{SOURCE3} Makefile.config.pld
%build
%{__make} clean
-%{__make} build \
- CONFIG=Makefile.config.pld
+%{__make} build
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,cron.d}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{plugins,plugin-conf.d}
-install -d $RPM_BUILD_ROOT/var/{lib,log}/munin
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cgi
%{__make} install \
- CONFIG=Makefile.config.pld \
- DOCDIR=$RPM_BUILD_ROOT%{_docdir}/munin \
- MANDIR=$RPM_BUILD_ROOT%{_mandir} \
DESTDIR=$RPM_BUILD_ROOT
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/munin-node
install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/munin
-install %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apache.conf
+install %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apache.conf
install node/node.d/README README.plugins
@@ -120,7 +111,6 @@
install server/munin-htaccess $RPM_BUILD_ROOT%{htmldir}/.htaccess
install server/style.css $RPM_BUILD_ROOT%{htmldir}/
-mv -f $RPM_BUILD_ROOT%{htmldir}/cgi/* $RPM_BUILD_ROOT%{_datadir}/%{name}/cgi/
# A hack so rpm won't find deps on perl(DBD::Sybase)
%if %{without sybase}
@@ -244,6 +234,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2005/10/07 09:23:51 baggins
+- simplify build and install
+
Revision 1.12 2005/10/06 21:48:12 baggins
- added apache config and pre/post scripts
- simplify use of sysconfdir macro
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/munin.spec?r1=1.12&r2=1.13&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
