[packages/ganeti] - removed template loftovers - list files

baggins baggins at pld-linux.org
Sat Jun 1 12:22:04 CEST 2013


commit 7adb0d043b42d7fc77b96ef47d224eb523ca26e4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jun 1 11:30:06 2013 +0200

    - removed template loftovers
    - list files

 ganeti.spec     | 161 ++++++++++++++++++++++++++++++++++----------------------
 ganeti.tmpfiles |   1 +
 2 files changed, 100 insertions(+), 62 deletions(-)
---
diff --git a/ganeti.spec b/ganeti.spec
index b0bab20..a03186c 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -6,6 +6,7 @@ License:	GPL v2
 Group:		Applications/System
 Source0:	https://ganeti.googlecode.com/files/%{name}-%{version}.tar.gz
 # Source0-md5:	9d9a0c5c0341d5775988961449f82b99
+Source1:	%{name}.tmpfiles
 URL:		https://code.google.com/p/ganeti/
 BuildRequires:	fakeroot
 BuildRequires:	gawk
@@ -29,20 +30,9 @@ BuildRequires:	rpmbuild(macros) >= 1.228
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
 %endif
-%if %{with systemd_service}
 BuildRequires:	rpmbuild(macros) >= 1.647
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	systemd-units >= 0.38
-%endif
-#BuildRequires:	-
-#BuildRequires:	autoconf
-#BuildRequires:	automake
-#BuildRequires:	intltool
-#BuildRequires:	libtool
-#Requires(postun):	-
-#Requires(pre,post):	-
-#Requires(preun):	-
-#Requires:	-
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -63,42 +53,6 @@ BuildArch:	noarch
 
 %description subpackage -l pl.UTF-8
 
-%package libs
-Summary:	-
-Summary(pl.UTF-8):	-
-Group:		Libraries
-
-%description libs
-
-%description libs -l pl.UTF-8
-
-%package devel
-Summary:	Header files for %{name} library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki %{name}
-Group:		Development/Libraries
-# if base package contains shared library for which these headers are
-#Requires:	%{name} = %{version}-%{release}
-# if -libs package contains shared library for which these headers are
-#Requires:	%{name}-libs = %{version}-%{release}
-
-%description devel
-Header files for %{name} library.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki %{name}.
-
-%package static
-Summary:	Static %{name} library
-Summary(pl.UTF-8):	Statyczna biblioteka %{name}
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static %{name} library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka %{name}.
-
 %prep
 %setup -q
 
@@ -124,15 +78,17 @@ Statyczna biblioteka %{name}.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
 %if %{with initscript}
 install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
 %endif
-#install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/ganeti.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -140,21 +96,12 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g xxx %{name}
 %useradd -u xxx -d /var/lib/%{name} -g %{name} -c "XXX User" %{name}
 
-%post
-
-%preun
-
 %postun
 if [ "$1" = "0" ]; then
 	%userremove %{name}
 	%groupremove %{name}
 fi
 
-%if %{with ldconfig}
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
-%endif
-
 %if %{with initscript}
 %post
 /sbin/chkconfig --add %{name}
@@ -180,14 +127,106 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CREDITS CHANGES ChangeLog NEWS README THANKS TODO
+%doc NEWS README UPGRADE
+%{systemdtmpfilesdir}/ganeti.conf
+%{_bindir}/hbal
+%{_bindir}/hcheck
+%{_bindir}/hinfo
+%{_bindir}/hscan
+%{_bindir}/hspace
+%{_bindir}/htools
+%dir %{_libdir}/ganeti
+%{_libdir}/ganeti/check-cert-expired
+%{_libdir}/ganeti/daemon-util
+%{_libdir}/ganeti/ensure-dirs
+%dir %{_libdir}/ganeti/iallocators
+%{_libdir}/ganeti/iallocators/hail
+%{_libdir}/ganeti/import-export
+%{_libdir}/ganeti/kvm-ifup
+%dir %{_libdir}/ganeti/tools
+%{_libdir}/ganeti/tools/burnin
+%{_libdir}/ganeti/tools/cfgshell
+%{_libdir}/ganeti/tools/cfgupgrade
+%{_libdir}/ganeti/tools/cfgupgrade12
+%{_libdir}/ganeti/tools/cluster-merge
+%{_libdir}/ganeti/tools/confd-client
+%{_libdir}/ganeti/tools/fmtjson
+%{_libdir}/ganeti/tools/kvm-console-wrapper
+%{_libdir}/ganeti/tools/lvmstrap
+%{_libdir}/ganeti/tools/master-ip-setup
+%{_libdir}/ganeti/tools/move-instance
+%{_libdir}/ganeti/tools/ovfconverter
+%{_libdir}/ganeti/tools/sanitize-config
+%{_libdir}/ganeti/tools/setup-ssh
+%{_libdir}/ganeti/tools/xen-console-wrapper
+%attr(755,root,root) %{_sbindir}/ganeti-cleaner
+%attr(755,root,root) %{_sbindir}/ganeti-confd
+%attr(755,root,root) %{_sbindir}/ganeti-listrunner
+%attr(755,root,root) %{_sbindir}/ganeti-masterd
+%attr(755,root,root) %{_sbindir}/ganeti-noded
+%attr(755,root,root) %{_sbindir}/ganeti-rapi
+%attr(755,root,root) %{_sbindir}/ganeti-watcher
+%attr(755,root,root) %{_sbindir}/gnt-backup
+%attr(755,root,root) %{_sbindir}/gnt-cluster
+%attr(755,root,root) %{_sbindir}/gnt-debug
+%attr(755,root,root) %{_sbindir}/gnt-group
+%attr(755,root,root) %{_sbindir}/gnt-instance
+%attr(755,root,root) %{_sbindir}/gnt-job
+%attr(755,root,root) %{_sbindir}/gnt-node
+%attr(755,root,root) %{_sbindir}/gnt-os
+%{_mandir}/man1/hail.1*
+%{_mandir}/man1/hbal.1*
+%{_mandir}/man1/hcheck.1*
+%{_mandir}/man1/hinfo.1*
+%{_mandir}/man1/hscan.1*
+%{_mandir}/man1/hspace.1*
+%{_mandir}/man1/htools.1*
+%{_mandir}/man7/ganeti-os-interface.7*
+%{_mandir}/man7/ganeti.7*
+%{_mandir}/man8/ganeti-cleaner.8*
+%{_mandir}/man8/ganeti-confd.8*
+%{_mandir}/man8/ganeti-listrunner.8*
+%{_mandir}/man8/ganeti-masterd.8*
+%{_mandir}/man8/ganeti-noded.8*
+%{_mandir}/man8/ganeti-rapi.8*
+%{_mandir}/man8/ganeti-watcher.8*
+%{_mandir}/man8/gnt-backup.8*
+%{_mandir}/man8/gnt-cluster.8*
+%{_mandir}/man8/gnt-debug.8*
+%{_mandir}/man8/gnt-group.8*
+%{_mandir}/man8/gnt-instance.8*
+%{_mandir}/man8/gnt-job.8*
+%{_mandir}/man8/gnt-node.8*
+%{_mandir}/man8/gnt-os.8*
+%dir %{py_sitescriptdir}/ganeti
+%{py_sitescriptdir}/ganeti/*.py*
+%dir %{py_sitescriptdir}/ganeti/client
+%{py_sitescriptdir}/ganeti/client/*.py*
+%dir %{py_sitescriptdir}/ganeti/confd
+%{py_sitescriptdir}/ganeti/confd/*.py*
+%dir %{py_sitescriptdir}/ganeti/http
+%{py_sitescriptdir}/ganeti/http/*.py*
+%dir %{py_sitescriptdir}/ganeti/hypervisor
+%{py_sitescriptdir}/ganeti/hypervisor/*.py*
+%dir %{py_sitescriptdir}/ganeti/impexpd
+%{py_sitescriptdir}/ganeti/impexpd/*.py*
+%dir %{py_sitescriptdir}/ganeti/masterd
+%{py_sitescriptdir}/ganeti/masterd/*.py*
+%dir %{py_sitescriptdir}/ganeti/rapi
+%{py_sitescriptdir}/ganeti/rapi/*.py*
+%dir %{py_sitescriptdir}/ganeti/server
+%{py_sitescriptdir}/ganeti/server/*.py*
+%dir %{py_sitescriptdir}/ganeti/tools
+%{py_sitescriptdir}/ganeti/tools/*.py*
+%dir %{py_sitescriptdir}/ganeti/utils
+%{py_sitescriptdir}/ganeti/utils/*.py*
+%dir %{py_sitescriptdir}/ganeti/watcher
+%{py_sitescriptdir}/ganeti/watcher/*.py*
 
 %if 0
 # if _sysconfdir != /etc:
 #%%dir %{_sysconfdir}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
-%attr(755,root,root) %{_bindir}/%{name}*
-%{_datadir}/%{name}
 %endif
 
 # initscript and its config
@@ -200,8 +239,6 @@ fi
 %{systemdunitdir}/%{name}.service
 %endif
 
-#%{_examplesdir}/%{name}-%{version}
-
 %if %{with subpackage}
 %files subpackage
 %defattr(644,root,root,755)
diff --git a/ganeti.tmpfiles b/ganeti.tmpfiles
new file mode 100644
index 0000000..1abb447
--- /dev/null
+++ b/ganeti.tmpfiles
@@ -0,0 +1 @@
+d /var/run/ganeti 0755 root root -
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ganeti.git/commitdiff/554d0f8c6ddabc55c8cd9c34120ceb836c00968e



More information about the pld-cvs-commit mailing list