* [Cluster-devel] conga Makefile
@ 2006-07-25 22:01 kupcevic
0 siblings, 0 replies; 8+ messages in thread
From: kupcevic @ 2006-07-25 22:01 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-07-25 22:01:52
Modified files:
. : Makefile
Log message:
Don't remove archives used for building
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
--- conga/Makefile 2006/07/24 20:17:01 1.6
+++ conga/Makefile 2006/07/25 22:01:52 1.7
@@ -51,4 +51,3 @@
tar -zcf ${CONGA_DIRNAME}.tar.gz ${TMP_DIR}/${CONGA_DIRNAME}
rm -rf ${TMP_DIR}/${CONGA_DIRNAME}
rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs conga.spec
- rm -rf ${CONGA_DIRNAME}.tar.gz
^ permalink raw reply [flat|nested] 8+ messages in thread* [Cluster-devel] conga Makefile
@ 2006-08-09 21:35 kupcevic
0 siblings, 0 replies; 8+ messages in thread
From: kupcevic @ 2006-08-09 21:35 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-08-09 21:35:48
Modified files:
. : Makefile
Log message:
typo
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
--- conga/Makefile 2006/08/09 20:53:21 1.8
+++ conga/Makefile 2006/08/09 21:35:47 1.9
@@ -25,7 +25,7 @@
echo "Run 'make install_conga' to install conga"
ricci:
- make -C ricci
+ make -C ricci ricci
luci:
make -C luci
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Cluster-devel] conga Makefile
@ 2006-08-15 3:59 kupcevic
0 siblings, 0 replies; 8+ messages in thread
From: kupcevic @ 2006-08-15 3:59 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-08-15 03:59:47
Modified files:
. : Makefile
Log message:
make clean should clean...
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
--- conga/Makefile 2006/08/09 21:35:47 1.9
+++ conga/Makefile 2006/08/15 03:59:47 1.10
@@ -65,7 +65,9 @@
make -C ricci distclean
make -C luci distclean
rm -f conga.spec conga.spec.in
- rm -f conga*.tar.gz conga*.src.rpm clustermon*.tar.gz clsutermon*.src.rpm
+ rm -f conga*.tar.gz conga*.src.rpm
+ rm -f clustermon.spec clustermon.spec.in
+ rm -f clustermon*.tar.gz clustermon*.src.rpm
rebuild: clean all
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Cluster-devel] conga Makefile
@ 2006-08-15 21:33 kupcevic
0 siblings, 0 replies; 8+ messages in thread
From: kupcevic @ 2006-08-15 21:33 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-08-15 21:33:54
Modified files:
. : Makefile
Log message:
remove spec files belonging to different builds
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
--- conga/Makefile 2006/08/15 03:59:47 1.10
+++ conga/Makefile 2006/08/15 21:33:54 1.11
@@ -79,6 +79,7 @@
rm -rf ${TMP_DIR}/${CONGA_DIRNAME}
cp -r . ${TMP_DIR}/${CONGA_DIRNAME}
rm -rf `find ${TMP_DIR}/${CONGA_DIRNAME} -name CVS`
+ rm -f ${TMP_DIR}/${CONGA_DIRNAME}/clustermon.spec*
rm -f ${TMP_DIR}/${CONGA_DIRNAME}/*gz
rm -f ${TMP_DIR}/${CONGA_DIRNAME}/*.rpm
tar -zcf ${CONGA_DIRNAME}.tar.gz ${TMP_DIR}/${CONGA_DIRNAME}
@@ -89,6 +90,7 @@
rm -rf ${TMP_DIR}/${CLUSTERMON_DIRNAME}
cp -r . ${TMP_DIR}/${CLUSTERMON_DIRNAME}
rm -rf `find ${TMP_DIR}/${CLUSTERMON_DIRNAME} -name CVS`
+ rm -f ${TMP_DIR}/${CLUSTERMON_DIRNAME}/conga.spec*
rm -f ${TMP_DIR}/${CLUSTERMON_DIRNAME}/*gz
rm -f ${TMP_DIR}/${CLUSTERMON_DIRNAME}/*.rpm
./luci/utils/remove_files ${TMP_DIR}/${CLUSTERMON_DIRNAME} ricci/ricci ricci/modules/log ricci/modules/service ricci/modules/rpm ricci/modules/storage luci/site luci/storage luci/cluster luci/homebase luci/plone-custom
^ permalink raw reply [flat|nested] 8+ messages in thread* [Cluster-devel] conga Makefile
@ 2006-11-17 20:24 kupcevic
0 siblings, 0 replies; 8+ messages in thread
From: kupcevic @ 2006-11-17 20:24 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-11-17 20:24:46
Modified files:
. : Makefile
Log message:
simplify (s)rpms build process
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
--- conga/Makefile 2006/08/15 21:33:54 1.11
+++ conga/Makefile 2006/11/17 20:24:46 1.12
@@ -73,9 +73,9 @@
rebuild: clean all
-srpms: srpm_conga srpm_clustermon
+srpms: conga_srpm clustermon_srpm
-srpm_conga: clean
+conga_srpm: clean
rm -rf ${TMP_DIR}/${CONGA_DIRNAME}
cp -r . ${TMP_DIR}/${CONGA_DIRNAME}
rm -rf `find ${TMP_DIR}/${CONGA_DIRNAME} -name CVS`
@@ -84,20 +84,41 @@
rm -f ${TMP_DIR}/${CONGA_DIRNAME}/*.rpm
tar -zcf ${CONGA_DIRNAME}.tar.gz ${TMP_DIR}/${CONGA_DIRNAME}
rm -rf ${TMP_DIR}/${CONGA_DIRNAME}
- rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs conga.spec
+ if [ -n "${DISTRO}" ] ; then \
+ rpmbuild --define "dist .${DISTRO}" --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs conga.spec ; \
+ else \
+ rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs conga.spec ; \
+ fi
-srpm_clustermon: clean
+clustermon_srpm: clean
rm -rf ${TMP_DIR}/${CLUSTERMON_DIRNAME}
cp -r . ${TMP_DIR}/${CLUSTERMON_DIRNAME}
rm -rf `find ${TMP_DIR}/${CLUSTERMON_DIRNAME} -name CVS`
rm -f ${TMP_DIR}/${CLUSTERMON_DIRNAME}/conga.spec*
rm -f ${TMP_DIR}/${CLUSTERMON_DIRNAME}/*gz
rm -f ${TMP_DIR}/${CLUSTERMON_DIRNAME}/*.rpm
- ./luci/utils/remove_files ${TMP_DIR}/${CLUSTERMON_DIRNAME} ricci/ricci ricci/modules/log ricci/modules/service ricci/modules/rpm ricci/modules/storage luci/site luci/storage luci/cluster luci/homebase luci/plone-custom
+ ./luci/utils/remove_files ${TMP_DIR}/${CLUSTERMON_DIRNAME} ricci/ricci ricci/modules/log ricci/modules/service ricci/modules/rpm ricci/modules/storage luci/site luci/storage luci/cluster luci/homebase luci/plone-custom luci/docs luci/logs
tar -zcf ${CLUSTERMON_DIRNAME}.tar.gz ${TMP_DIR}/${CLUSTERMON_DIRNAME}
rm -rf ${TMP_DIR}/${CLUSTERMON_DIRNAME}
- rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs clustermon.spec
+ if [ -n "${DISTRO}" ] ; then \
+ rpmbuild --define "dist .${DISTRO}" --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs clustermon.spec ; \
+ else \
+ rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs clustermon.spec ; \
+ fi
+
+rpms: conga_rpm clustermon_rpm
+
+conga_rpm: conga_srpm
+ if [ -n "${DISTRO}" ] ; then \
+ rpmbuild --define "dist .${DISTRO}" --rebuild ${CONGA_DIRNAME}-${RELEASE}.${DISTRO}.src.rpm ; \
+ else \
+ rpmbuild --rebuild ${CONGA_DIRNAME}-${RELEASE}.src.rpm ; \
+ fi
+
+clustermon_rpm: clustermon_srpm
+ if [ -n "${DISTRO}" ] ; then \
+ rpmbuild --define "dist .${DISTRO}" --rebuild ${CLUSTERMON_DIRNAME}-${RELEASE}.${DISTRO}.src.rpm ; \
+ else \
+ rpmbuild --rebuild ${CLUSTERMON_DIRNAME}-${RELEASE}.src.rpm ; \
+ fi
-rpms: srpms
- rpmbuild --rebuild ${CONGA_DIRNAME}-${RELEASE}.src.rpm
- rpmbuild --rebuild ${CLUSTERMON_DIRNAME}-${RELEASE}.src.rpm
^ permalink raw reply [flat|nested] 8+ messages in thread* [Cluster-devel] conga Makefile
@ 2006-11-17 20:41 kupcevic
0 siblings, 0 replies; 8+ messages in thread
From: kupcevic @ 2006-11-17 20:41 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: kupcevic at sourceware.org 2006-11-17 20:41:18
Modified files:
. : Makefile
Log message:
simplify (s)rpms build process
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.11&r2=1.11.2.1
--- conga/Makefile 2006/08/15 21:33:54 1.11
+++ conga/Makefile 2006/11/17 20:41:17 1.11.2.1
@@ -73,9 +73,9 @@
rebuild: clean all
-srpms: srpm_conga srpm_clustermon
+srpms: conga_srpm clustermon_srpm
-srpm_conga: clean
+conga_srpm: clean
rm -rf ${TMP_DIR}/${CONGA_DIRNAME}
cp -r . ${TMP_DIR}/${CONGA_DIRNAME}
rm -rf `find ${TMP_DIR}/${CONGA_DIRNAME} -name CVS`
@@ -84,20 +84,41 @@
rm -f ${TMP_DIR}/${CONGA_DIRNAME}/*.rpm
tar -zcf ${CONGA_DIRNAME}.tar.gz ${TMP_DIR}/${CONGA_DIRNAME}
rm -rf ${TMP_DIR}/${CONGA_DIRNAME}
- rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs conga.spec
+ if [ -n "${DISTRO}" ] ; then \
+ rpmbuild --define "dist .${DISTRO}" --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs conga.spec ; \
+ else \
+ rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs conga.spec ; \
+ fi
-srpm_clustermon: clean
+clustermon_srpm: clean
rm -rf ${TMP_DIR}/${CLUSTERMON_DIRNAME}
cp -r . ${TMP_DIR}/${CLUSTERMON_DIRNAME}
rm -rf `find ${TMP_DIR}/${CLUSTERMON_DIRNAME} -name CVS`
rm -f ${TMP_DIR}/${CLUSTERMON_DIRNAME}/conga.spec*
rm -f ${TMP_DIR}/${CLUSTERMON_DIRNAME}/*gz
rm -f ${TMP_DIR}/${CLUSTERMON_DIRNAME}/*.rpm
- ./luci/utils/remove_files ${TMP_DIR}/${CLUSTERMON_DIRNAME} ricci/ricci ricci/modules/log ricci/modules/service ricci/modules/rpm ricci/modules/storage luci/site luci/storage luci/cluster luci/homebase luci/plone-custom
+ ./luci/utils/remove_files ${TMP_DIR}/${CLUSTERMON_DIRNAME} ricci/ricci ricci/modules/log ricci/modules/service ricci/modules/rpm ricci/modules/storage luci/site luci/storage luci/cluster luci/homebase luci/plone-custom luci/docs luci/logs
tar -zcf ${CLUSTERMON_DIRNAME}.tar.gz ${TMP_DIR}/${CLUSTERMON_DIRNAME}
rm -rf ${TMP_DIR}/${CLUSTERMON_DIRNAME}
- rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs clustermon.spec
+ if [ -n "${DISTRO}" ] ; then \
+ rpmbuild --define "dist .${DISTRO}" --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs clustermon.spec ; \
+ else \
+ rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs clustermon.spec ; \
+ fi
+
+rpms: conga_rpm clustermon_rpm
+
+conga_rpm: conga_srpm
+ if [ -n "${DISTRO}" ] ; then \
+ rpmbuild --define "dist .${DISTRO}" --rebuild ${CONGA_DIRNAME}-${RELEASE}.${DISTRO}.src.rpm ; \
+ else \
+ rpmbuild --rebuild ${CONGA_DIRNAME}-${RELEASE}.src.rpm ; \
+ fi
+
+clustermon_rpm: clustermon_srpm
+ if [ -n "${DISTRO}" ] ; then \
+ rpmbuild --define "dist .${DISTRO}" --rebuild ${CLUSTERMON_DIRNAME}-${RELEASE}.${DISTRO}.src.rpm ; \
+ else \
+ rpmbuild --rebuild ${CLUSTERMON_DIRNAME}-${RELEASE}.src.rpm ; \
+ fi
-rpms: srpms
- rpmbuild --rebuild ${CONGA_DIRNAME}-${RELEASE}.src.rpm
- rpmbuild --rebuild ${CLUSTERMON_DIRNAME}-${RELEASE}.src.rpm
^ permalink raw reply [flat|nested] 8+ messages in thread* [Cluster-devel] conga Makefile
@ 2007-03-06 11:52 kupcevic
0 siblings, 0 replies; 8+ messages in thread
From: kupcevic @ 2007-03-06 11:52 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: kupcevic at sourceware.org 2007-03-06 11:52:11
Modified files:
. : Makefile
Log message:
Append .el5 to rpm names
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.11.2.1&r2=1.11.2.2
--- conga/Makefile 2006/11/17 20:41:17 1.11.2.1
+++ conga/Makefile 2007/03/06 11:52:11 1.11.2.2
@@ -15,6 +15,8 @@
CONGA_DIRNAME=conga-${VERSION}
CLUSTERMON_DIRNAME=clustermon-${VERSION}
+DISTRO ?= el5
+
.PHONY: conga ricci luci clustermon
^ permalink raw reply [flat|nested] 8+ messages in thread* [Cluster-devel] conga Makefile
@ 2007-03-27 17:24 rmccabe
0 siblings, 0 replies; 8+ messages in thread
From: rmccabe @ 2007-03-27 17:24 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2007-03-27 18:24:44
Modified files:
. : Makefile
Log message:
Add .el4 to rpm names
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.12&r2=1.12.2.1
--- conga/Makefile 2006/11/17 20:24:46 1.12
+++ conga/Makefile 2007/03/27 17:24:44 1.12.2.1
@@ -15,6 +15,8 @@
CONGA_DIRNAME=conga-${VERSION}
CLUSTERMON_DIRNAME=clustermon-${VERSION}
+DISTRO ?= el4
+
.PHONY: conga ricci luci clustermon
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2007-03-27 17:24 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-25 22:01 [Cluster-devel] conga Makefile kupcevic
-- strict thread matches above, loose matches on Subject: below --
2006-08-09 21:35 kupcevic
2006-08-15 3:59 kupcevic
2006-08-15 21:33 kupcevic
2006-11-17 20:24 kupcevic
2006-11-17 20:41 kupcevic
2007-03-06 11:52 kupcevic
2007-03-27 17:24 rmccabe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).