X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=codemux.spec;h=d61582c7e3fa2155e0fbffb7373ba5817a7a81b2;hb=b33d471ecb3cbcd3b657213bd54cfd84d617f1c9;hp=a713adf4fa5caf48c0a5a629c1e04596f35ef8ca;hpb=c208f01c6a4c8d896c81692f65a302b426cb7c5f;p=codemux.git

diff --git a/codemux.spec b/codemux.spec
index a713adf..d61582c 100644
--- a/codemux.spec
+++ b/codemux.spec
@@ -1,14 +1,32 @@
-Summary: CoDemux - HTTP port demultiplexer
-Name: codemux
-Version: 0.5
-Release: 1
+#
+# $Id$
+#
+%define url $URL$
+
+%define name codemux 
+%define version 0.1
+%define taglevel 12
+
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+
+Summary: CoDemux - HTTP port DeMux
+Name: %{name} 
+Version: %{version}
+Release: %{release}
 License: Private
 Group: System Environment/Base
-URL: http://codeen.cs.princeton.edu/
-Source0: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source: %{name}-%{version}.tar.gz
+Vendor: PlanetLab
+Packager: PlanetLab Central <support@planet-lab.org>
+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
 
 %description
+codemux is a privileged port (80) sharing service that passes traffic to and from slices via localhost ports.
+
 
 %prep
 %setup -q
@@ -16,31 +34,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 make clean
 
 %build
-make
+make RPM_VERSION=%{version}.%{taglevel}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-make INSTALL_ROOT=$RPM_BUILD_ROOT install-all
-
-# Build and install in %post so that it gets put in the right site-packages directory
-#rm -rf $RPM_BUILD_ROOT/usr/lib/python*
-#install -D -m 755 python/Proper.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/Proper.py
+make INSTALL_ROOT=$RPM_BUILD_ROOT install
+install -D -m 644 codemux.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/codemux
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
+%defattr(0644,root,root)
 %attr(0755,root,root) %{_initrddir}/codemux
 %config /etc/codemux/codemux.conf
-%attr(0755,root,root) /usr/local/planetlab/sbin/codemux
+%attr(0755,root,root) /usr/sbin/codemux
+%{_sysconfdir}/logrotate.d/codemux
 
 %post
 chkconfig codemux reset
 
 if [ -z "$PL_BOOTCD" ]; then
-    /sbin/ldconfig
     /etc/init.d/codemux restart
 fi
 
@@ -55,9 +69,23 @@ if [ "$1" = 0 ]; then
     fi
 fi
 
-%doc
-
 %changelog
+* Fri Jun 06 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - CoDemux-0.1-12
+- 
+- KyoungSoo added fix to prevent failure with new compilers
+- 
+
+* Fri May 09 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - CoDemux-0.1-11
+- 
+
+* Thu Apr 24 2008 Faiyaz Ahmed <faiyaza@cs.princeton.edu> - CoDemux-0.1-10
+- 
+- Examples in conf file are enough.  Removed PLC specific entries.
+- 
+
+* Fri Mar 28 2008 Faiyaz Ahmed <faiyaza@cs.princeton.edu> - CoDemux-0.1-7 CoDemux-0.1-8
+- 
+
 * Sun Apr 22 2007 KYOUNGSOO PARK <kyoungso@park.cs.princeton.edu> - 
 - Initial build.