[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga ./conga.spec.in.in luci/Makefile ricci/M ...



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic sourceware org	2006-07-05 21:33:46

Modified files:
	.              : conga.spec.in.in 
	luci           : Makefile 
	ricci          : Makefile 
	ricci/modules/cluster/clumon: Makefile 

Log message:
	towards FC compliant RPM:
	specfile:
	- automatic distro versioning
	- don't define _libdir on x86_64
	- add URL
	- shorter summaries
	- (noreplace) config files
	- documentation in each package
	build sys:
	- minimal documentation for each pkg

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4

--- conga/conga.spec.in.in	2006/06/30 22:12:34	1.12
+++ conga/conga.spec.in.in	2006/07/05 21:33:46	1.13
@@ -11,18 +11,14 @@
 ###############################################################################
 
 %define vers @@VERS@@
-%define rel @@REL@@
-
-
-%ifarch x86_64
-%define _libdir /usr/lib64
-%endif
+%define rel @@REL@@%{?dist}
 
 %define PEGASUS_PROVIDERS_DIR %{_libdir}/Pegasus/providers
 
 
 
 
+
 ############  SRPM  ###################
 
 
@@ -30,6 +26,7 @@
 Version: %vers
 Release: %rel
 License: GPL
+URL: http://sources.redhat.com/cluster/conga
 
 Group: System Environment/Base
 Summary: Conga Remote Management System - source code
@@ -57,6 +54,7 @@
 #./autogen.sh
 #./configure --arch=%{_arch} --sbindir=%{_sbindir} --libdir=%{_libdir} --docdir=%{_docdir}
 %configure --arch=%{_arch} --docdir=%{_docdir} --pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR}
+#make %{?_smp_mflags}
 make
 
 %install
@@ -77,24 +75,27 @@
 
 %package -n luci
 Group: System Environment/Base
-Summary: Conga Remote Management System - Management Station (https frontend)
+Summary: Conga Remote Management System - Management Station
+URL: http://sources.redhat.com/cluster/conga
+
 Requires: chkconfig initscripts
 Requires: python zope plone
-Requires: openssl mailcap stunnel
+Requires: openssl mailcap stunnel 
+Requires: sed util-linux
 Requires: ricci = %{version}-%{release}
 
 
 %description -n luci
 Conga is a project developing management system for remote stations. 
-It consists of luci, https frontend, and ricci, secure daemon that dispatches 
-incoming messages to underlying management modules. 
+It consists of luci, https frontend, and ricci, secure daemon that 
+dispatches incoming messages to underlying management modules. 
 
 This package contains Luci website.
 
 
 %files -n luci
 %defattr(-,root,root)
-%config				%{_sysconfdir}/rc.d/init.d/luci
+%config(noreplace)		%{_sysconfdir}/rc.d/init.d/luci
 %config(noreplace)		%{_sysconfdir}/sysconfig/luci
 				%{_sbindir}/luci_admin
 %attr(-,luci,root)		%{_localstatedir}/lib/luci
@@ -102,6 +103,7 @@
 %config				%{_localstatedir}/lib/luci/etc/zope.conf
 %config(noreplace)		%{_localstatedir}/lib/luci/etc/logrotate.conf
 %config				%{_localstatedir}/lib/luci/etc/stunnel.conf
+				%{_docdir}/luci-%{version}/
 
 %pre -n luci
 /usr/sbin/groupadd -r -f luci >/dev/null 2>&1
@@ -163,10 +165,12 @@
 
 %package -n ricci
 Group: System Environment/Base
-Summary: Conga Remote Management System - Managed Station (dispatcher daemon, including basic management modules)
+Summary: Conga Remote Management System - Managed Station
+URL: http://sources.redhat.com/cluster/conga
+
 Requires: chkconfig initscripts
 Requires: oddjob dbus openssl pam
-Requires: sed
+Requires: sed util-linux
 Requires: ricci-modcluster = %{version}-%{release}
 
 # modreboot
@@ -197,35 +201,34 @@
 
 %files -n ricci
 %defattr(-,root,root)
-
 # ricci
-#%doc README COPYING
-%config			%{_sysconfdir}/rc.d/init.d/ricci
+%config(noreplace)	%{_sysconfdir}/rc.d/init.d/ricci
 %config(noreplace)	%{_sysconfdir}/pam.d/ricci
-			%{_sysconfdir}/oddjobd.conf.d/ricci.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf
 %attr(-,ricci,root)	%{_localstatedir}/lib/ricci
 			%{_sbindir}/ricci
 %attr(4755,root,root)	%{_sbindir}/ricci-auth
 			%{_sbindir}/ricci-worker
+			%{_docdir}/ricci-%{version}/
 # modrpm
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf
 			%{_sbindir}/ricci-modrpm
 			%{_sbindir}/ricci-modrpm.exe
 # modstorage
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
 			%{_sbindir}/ricci-modstorage
 			%{_sbindir}/ricci-modstorage.exe
 # modservice
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
 			%{_sbindir}/ricci-modservice
 			%{_sbindir}/ricci-modservice.exe
 # modlog
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
 			%{_sbindir}/ricci-modlog
 			%{_sbindir}/ricci-modlog.exe
 
@@ -280,10 +283,12 @@
 
 %package -n ricci-modcluster
 Group: System Environment/Base
-Summary: Conga Remote Management System - Managed Clustered Station (cluster management module)
+Summary: Conga Remote Management System - Managed Clustered Station
+URL: http://sources.redhat.com/cluster/conga
+
 Requires: chkconfig initscripts
 Requires: oddjob openssl
-Requires: sed
+Requires: sed util-linux
 Conflicts: clumon
 
 %description -n ricci-modcluster
@@ -291,18 +296,19 @@
 It consists of luci, https frontend, and ricci, secure daemon that dispatches 
 incoming messages to underlying management modules. 
 
-This package contains Red Hat Enterprise Linux Cluster Suite ricci management module. 
+This package contains Red Hat Enterprise Linux Cluster Suite 
+ricci management module. 
 
 
 %files -n ricci-modcluster
 %defattr(-,root,root)
-#%doc README
-%config			%{_sysconfdir}/rc.d/init.d/ricci-modclusterd
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modcluster.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modcluster.systembus.conf
+%config(noreplace)	%{_sysconfdir}/rc.d/init.d/ricci-modclusterd
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modcluster.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modcluster.systembus.conf
 			%{_sbindir}/ricci-modcluster
 			%{_sbindir}/ricci-modcluster.exe
 			%{_sbindir}/ricci-modclusterd
+			%{_docdir}/ricci-modcluster-%{version}/
 
 %post -n ricci-modcluster
 /sbin/chkconfig --add ricci-modclusterd
@@ -338,6 +344,8 @@
 %package -n cluster-snmp
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
+URL: http://sources.redhat.com/cluster/conga
+
 Requires: ricci-modcluster = %{version}-%{release}
 Requires: net-snmp 
 Requires: oddjob openssl
@@ -349,8 +357,8 @@
 %files -n cluster-snmp
 %defattr(-,root,root)
 			%{_libdir}/cluster-snmp/
-%attr(644,root,root)	%{_datadir}/snmp/mibs/REDHAT-MIB
-%attr(644,root,root)	%{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB
+			%{_datadir}/snmp/mibs/REDHAT-MIB
+			%{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB
 			%{_docdir}/cluster-snmp-%{version}/
 
 %pre -n cluster-snmp
@@ -381,6 +389,8 @@
 %package -n cluster-cim
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
+URL: http://sources.redhat.com/cluster/conga
+
 Requires: ricci-modcluster = %{version}-%{release}
 Requires: tog-pegasus 
 Requires: oddjob openssl
@@ -391,8 +401,8 @@
 
 %files -n cluster-cim
 %defattr(-,root,root)
-%{PEGASUS_PROVIDERS_DIR}/libRedHatClusterProvider.so
-%{_docdir}/cluster-cim-%{version}/
+			%{PEGASUS_PROVIDERS_DIR}/libRedHatClusterProvider.so
+			%{_docdir}/cluster-cim-%{version}/
 
 %pre -n cluster-cim
 exit 0
--- conga/luci/Makefile	2006/07/05 17:55:32	1.10
+++ conga/luci/Makefile	2006/07/05 21:33:46	1.11
@@ -1,6 +1,8 @@
-# $Id: Makefile,v 1.10 2006/07/05 17:55:32 rmccabe Exp $
+# $Id: Makefile,v 1.11 2006/07/05 21:33:46 kupcevic Exp $
 ZOPEINSTANCE=/var/lib/luci
 
+include ../make/version.in
+
 
 all: luci
 
@@ -21,6 +23,8 @@
 	make -C init.d install
 	make -C sysconfig install
 	make -C docs install
+	install -d ${DESTDIR}/usr/share/doc/luci-${VERSION}/
+	install -m 644 COPYING ${DESTDIR}/usr/share/doc/luci-${VERSION}/
 
 
 clean:
--- conga/ricci/Makefile	2006/06/15 03:08:35	1.8
+++ conga/ricci/Makefile	2006/07/05 21:33:46	1.9
@@ -27,6 +27,10 @@
 	make -C modules install
 	make -C init.d install
 	make -C pam.d install
+	$(INSTALL_DIR)  ${docdir}/ricci-${VERSION}/
+	$(INSTALL_FILE) COPYING ${docdir}/ricci-${VERSION}/
+	$(INSTALL_DIR)  ${docdir}/ricci-modcluster-${VERSION}/
+	$(INSTALL_FILE) COPYING ${docdir}/ricci-modcluster-${VERSION}/
 
 
 uninstall: 
--- conga/ricci/modules/cluster/clumon/Makefile	2006/06/30 22:26:12	1.3
+++ conga/ricci/modules/cluster/clumon/Makefile	2006/07/05 21:33:46	1.4
@@ -40,6 +40,7 @@
 	$(INSTALL_DIR)  ${docdir}/cluster-cim-${VERSION}
 	$(INSTALL_FILE) README ${docdir}/cluster-cim-${VERSION}/
 	$(INSTALL_FILE) README.cim ${docdir}/cluster-cim-${VERSION}/
+	$(INSTALL_FILE) COPYING ${docdir}/cluster-cim-${VERSION}/
 	$(INSTALL_FILE) RedHat_ClusterProvider.mof ${docdir}/cluster-cim-${VERSION}/
 	$(INSTALL_FILE) RedHat_ClusterSchema.mof ${docdir}/cluster-cim-${VERSION}/
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]