removed version had-coded in codemux.c and passes rpm version number instead
+# overridden when invoked through rpmbuild
+RPM_VERSION=0.0
+CFLAGS = -Wall -O -DRPM_VERSION=\"$(RPM_VERSION)\"
among them */
#define FAIRNESS_CUTOFF (MAX_CONNS * 0.85)
among them */
#define FAIRNESS_CUTOFF (MAX_CONNS * 0.85)
-/* codemux version */
-#define CODEMUX_VERSION "0.4"
+/* codemux version, from Makefile, or specfile */
+#define CODEMUX_VERSION RPM_VERSION
typedef struct FlowBuf {
int fb_refs; /* num refs */
typedef struct FlowBuf {
int fb_refs; /* num refs */
+#
+# $Id$
+#
+%define url $URL$
+
%define name codemux
%define version 0.1
%define name codemux
%define version 0.1
-%define release 8%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define taglevel 7
+
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Summary: CoDemux - HTTP port DeMux
Name: %{name}
Summary: CoDemux - HTTP port DeMux
Name: %{name}
Source: %{name}-%{version}.tar.gz
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
Source: %{name}-%{version}.tar.gz
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.0
-URL: http://codeen.cs.princeton.edu/
+Distribution: PlanetLab %{plrelease}
+URL: %(echo %{url} | cut -d ' ' -f 2)
+#URL: http://codeen.cs.princeton.edu/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Requires: vnet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Requires: vnet
+make RPM_VERSION=%{version}.%{taglevel}
%install
rm -rf $RPM_BUILD_ROOT
%install
rm -rf $RPM_BUILD_ROOT