[MySQL-zrm/el6] Fix up doc (and other) install

Orion Poplawski orion at fedoraproject.org
Wed Mar 19 22:31:42 UTC 2014


commit 9742bfefad84e08d146e1a5beb2f22fd36acf20c
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Aug 2 22:56:21 2013 -0600

    Fix up doc (and other) install

 MySQL-zrm.spec |   98 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 49 insertions(+), 49 deletions(-)
---
diff --git a/MySQL-zrm.spec b/MySQL-zrm.spec
index 03c0c45..559ad80 100644
--- a/MySQL-zrm.spec
+++ b/MySQL-zrm.spec
@@ -1,26 +1,26 @@
-Name:		MySQL-zrm
-Version:	2.2.0
-Release:	3%{?dist}
-Summary:	MySQL backup manager
-
-Group:		Applications/System
-License:	GPLv2
-URL:		http://www.zmanda.com/backup-mysql.html
-source0:	http://www.zmanda.com/downloads/community/ZRM-MySQL/2.2/Source/MySQL-zrm-%{version}.tar.gz
-Patch0:		MySQL-zrm-disable-xinetd-service.patch
-Patch1:		MySQL-zrm-2.2.0-quiet.patch
-
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch:	noarch
-
-Requires:	xinetd
-Requires:	logrotate
-Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:	perl(DBI)
-Requires:	perl(XML::Parser)
-Requires:	perl(Data::Report) >= 0.05 
-Requires:	perl(Data::Report::Plugin::Html) 
-Requires:	perl(Data::Report::Plugin::Text) 
+Name:           MySQL-zrm
+Version:        2.2.0
+Release:        3%{?dist}
+Summary:        MySQL backup manager
+
+Group:          Applications/System
+License:        GPLv2
+URL:            http://www.zmanda.com/backup-mysql.html
+source0:        http://www.zmanda.com/downloads/community/ZRM-MySQL/2.2/Source/MySQL-zrm-%{version}.tar.gz
+Patch0:         MySQL-zrm-disable-xinetd-service.patch
+Patch1:         MySQL-zrm-2.2.0-quiet.patch
+
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildArch:      noarch
+
+Requires:       xinetd
+Requires:       logrotate
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(DBI)
+Requires:       perl(XML::Parser)
+Requires:       perl(Data::Report) >= 0.05 
+Requires:       perl(Data::Report::Plugin::Html) 
+Requires:       perl(Data::Report::Plugin::Text) 
 
 %description
 Easy-to-use yet flexible and robust backup and recovery solution for MySQL 
@@ -40,29 +40,29 @@ rm -rf usr/lib/mysql-zrm/XML
 rm -rf var/log/mysql-zrm/*
 
 %install
-mkdir -p %{buildroot}%{perl_vendorlib}/
-mkdir -p %{buildroot}%{_mandir}/man1/
-mkdir -p %{buildroot}%{_mandir}/man5/
-mkdir -p %{buildroot}%{_sharedstatedir}/
-mkdir -p %{buildroot}%{_var}/log/
-mkdir -p %{buildroot}%{_datadir}/
-mkdir -p %{buildroot}%{_bindir}/
-mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d/
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
-mkdir -p %{buildroot}%{_sysconfdir}/mysql-zrm/
+mkdir -p %{buildroot}%{perl_vendorlib}
+mkdir -p %{buildroot}%{_docdir}
+mkdir -p %{buildroot}%{_mandir}/man{1,5}
+mkdir -p %{buildroot}%{_sharedstatedir}
+mkdir -p %{buildroot}%{_var}/log
+mkdir -p %{buildroot}%{_datadir}
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+mkdir -p %{buildroot}%{_sysconfdir}/mysql-zrm
 
 # install ourselves in correct locations
-cp -rp usr/lib/mysql-zrm/ZRM			%{buildroot}/%{perl_vendorlib}
-cp -rp usr/share/man/man1/*			%{buildroot}/%{_mandir}/man1/
-cp -rp usr/share/man/man5/*			%{buildroot}/%{_mandir}/man5/
-cp -rp var/lib/*				%{buildroot}/%{_sharedstatedir}
-cp -rp var/log/*				%{buildroot}/%{_var}/log/
-cp -rp usr/share/*				%{buildroot}/%{_datadir}/
-cp -rp usr/bin/*				%{buildroot}/%{_bindir}/
-cp -rp etc/mysql-zrm				%{buildroot}/%{_sysconfdir}/
-cp -rp etc/xinetd.d/mysql-zrm-socket-server	%{buildroot}/%{_sysconfdir}/xinetd.d/
+cp -rp usr/lib/mysql-zrm/ZRM                    %{buildroot}/%{perl_vendorlib}
+cp -rp usr/share/man/man1/*                     %{buildroot}/%{_mandir}/man1/
+cp -rp usr/share/man/man5/*                     %{buildroot}/%{_mandir}/man5/
+cp -rp var/lib/*                                %{buildroot}/%{_sharedstatedir}
+cp -rp var/log/*                                %{buildroot}/%{_var}/log/
+cp -rp usr/share/*                              %{buildroot}/%{_datadir}/
+cp -rp usr/bin/*                                %{buildroot}/%{_bindir}/
+cp -rp etc/mysql-zrm                            %{buildroot}/%{_sysconfdir}/
+cp -rp etc/xinetd.d/mysql-zrm-socket-server     %{buildroot}/%{_sysconfdir}/xinetd.d/
 # name logrotate job as package name
-cp -rp etc/logrotate.d/mysql-zrm		%{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
+cp -rp etc/logrotate.d/mysql-zrm                %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 
 # This will store passwords, restrict permissions
 chmod 640 %{buildroot}%{_sysconfdir}/mysql-zrm/mysql-zrm.conf
@@ -74,16 +74,16 @@ rm -rf %{buildroot}
 
 %files
 %attr(-,mysql,mysql) %dir %{_var}/log/mysql-zrm
-%dir %{_sharedstatedir}/mysql-zrm
-%dir %{_sysconfdir}/mysql-zrm/
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/mysql-zrm/
+%{_sharedstatedir}/mysql-zrm
 %{_datadir}/mysql-zrm/plugins/*.smf
 %attr(0755,root,root) %{_datadir}/mysql-zrm/plugins/*.pl
 %attr(0755,root,root) %{_bindir}/*
 %{perl_vendorlib}/ZRM
-
-%doc %{_mandir}/man1/*
-%doc %{_mandir}/man5/*
-%doc usr/share/doc/*
+%{_docdir}/%{name}-%{version}/
+%{_mandir}/man1/*
+%{_mandir}/man5/*
 
 %config(noreplace) %{_sysconfdir}/xinetd.d/mysql-zrm-socket-server
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}


More information about the scm-commits mailing list