X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=codemux.spec;h=a29c3bfe047feec49782c8c87240b2257787b63a;hb=refs%2Fheads%2Fmaster;hp=f889fcb0e2991274e332c94bd1ecea9f963593f1;hpb=1607ccd6b469b94f68edc8205332b33a2ff3f9e2;p=codemux.git

diff --git a/codemux.spec b/codemux.spec
index f889fcb..a29c3bf 100644
--- a/codemux.spec
+++ b/codemux.spec
@@ -1,11 +1,6 @@
-#
-# $Id$
-#
-%define url $URL$
-
 %define name codemux 
 %define version 0.1
-%define taglevel 8
+%define taglevel 15
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -19,7 +14,7 @@ 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: %{SCMURL}
 #URL: http://codeen.cs.princeton.edu/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #Requires: vnet
@@ -37,10 +32,9 @@ make clean
 make RPM_VERSION=%{version}.%{taglevel}
 
 %install
-install -D -m 644 codemux.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/codemux
 rm -rf $RPM_BUILD_ROOT
-
 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
@@ -48,14 +42,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(0644,root,root)
 %attr(0755,root,root) %{_initrddir}/codemux
-%config /etc/codemux/codemux.conf
+%config(noreplace) /etc/codemux/codemux.conf
 %attr(0755,root,root) /usr/sbin/codemux
+%{_sysconfdir}/logrotate.d/codemux
 
 %post
-chkconfig codemux reset
+chkconfig --add codemux
 
 if [ -z "$PL_BOOTCD" ]; then
-    /etc/init.d/codemux restart
+    /etc/init.d/codemux condrestart
 fi
 
 %preun
@@ -70,6 +65,28 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+* Mon Jan 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - codemux-0.1-15
+- no semantic change - just fixed specfile for git URL
+
+* Tue Mar 09 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - CoDemux-0.1-14
+- introduce an IP field
+
+* Tue Dec 02 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - CoDemux-0.1-13
+- Add condrestart to the initscript and add a way to limit codemux to one IP.
+
+* 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
 -