Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update [release-1_4_x-branch]: /current/support/

Project highlights: Stable Version: 1.6.1, Development Version: 1.7.6

current
Discussion topic

Back to topic list

CVS update [release-1_4_x-branch]: /current/support/

Reply

Author hunterm
Full name Hunter Matthews
Date 2003-02-13 17:52:29 PST
Message Tag: release-1_4_x-branch
User: hunterm
Date: 03/02/13 17:52:29

Modified
 /current/support/
  current.spec

Log
 Fixed the spec file to build for both 7.x and 8.x dependancies. 8.x is the
 default, --define "rhl8x 0" for 7.x builds.

File Changes:

Directory: /current/support/
============================

File [changed]: current.spec
Url: http://current.tigri​s.org/source/browse/​current/support/curr​ent.spec.diff?r1=1.2​.4.3&r2=1.2.4.4
Delta lines: +17 -22
---------------------
--- current.spec 12 Feb 2003 14:24:13 -0000 1.2.4.3
+++ current.spec 14 Feb 2003 01:52:28 -0000 1.2.4.4
@@ -1,25 +1,30 @@
-#%define for8x 1
+##
+# To build for Red Hat 7.x, build with:
+# rpmbuild --rebuild --define "rhl8x 0" dulog-*src.rpm
+#
+%{!?rhl8x:%define rhl8x 1}
+
+# I do all this junk at the top to get it out of the way, so the rest of
+# the file looks _sort_of_ sane.
+%if %{rhl8x}
+%define release 1.8x
+%define additional_requires httpd librpm404 rpm404-python
+%else
+%define release 1.7x
+%define additional_requires apache python-xmlrpc
+%endif
 
 Summary: A server for Red Hat's up2date tools.
 Name: current
 Version: 1.4.3
-Release: 1
+Release: %{release}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.biology.d​uke.edu/computer/uni​x/current
 Source0: ftp://ftp.biology.du​ke.edu/pub/admin/cur​rent/%{name}-%{versi​on}.tar.gz
-
 Requires: python rpm-python mod_python mod_ssl
 Requires: rpm >= 4.0.2-8
-
-%if %{for8x}
-Requires: httpd librpm404 rpm404-python
-
-%else
-Requires: python-xmlrpc apache
-
-%endif
-
+Requires: %{additional_requires}
 BuildRequires: docbook-style-xsl docbook-style-dsssl docbook-dtds
 BuildRequires: docbook-utils docbook-utils-pdf
 BuildArchitectures: noarch
@@ -45,16 +50,6 @@
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-# %post
-# if [ "$1" = "0" ]; then
-# /sbin/chkconfig --add current
-# fi
-#
-# %preun
-# if [ "$1" = "0" ]; then
-# /sbin/chkconfig --del current
-# fi
 
 %files
 %defattr(-,root,root)




--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: cvs-unsubscribe@curr​ent.tigris.org
For additional commands, e-mail: cvs-help at current dot tigris dot org

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update [release-1_4_x-branch]: /current/support/ hunterm Hunter Matthews 2003-02-13 17:52:29 PST
Messages per page: