rpms/collectl/EL-5 .cvsignore, 1.13, 1.14 collectl.spec, 1.13, 1.14 sources, 1.13, 1.14

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7074

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Wed Feb 17 2010 Dan Horák <dan[at]danny.cz> 3.4.0-1
- upgrade to upstream version 3.4.0
- updated directory layout to match upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	5 Jan 2010 09:43:48 -0000	1.13
+++ .cvsignore	18 Feb 2010 13:17:24 -0000	1.14
@@ -1 +1 @@
-collectl-3.3.6.src.tar.gz
+collectl-3.4.0.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/collectl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- collectl.spec	5 Jan 2010 09:43:48 -0000	1.13
+++ collectl.spec	18 Feb 2010 13:17:24 -0000	1.14
@@ -1,6 +1,6 @@
 Summary: An utility to collect various linux performance data
 Name: collectl
-Version: 3.3.6
+Version: 3.4.0
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -27,7 +27,7 @@ A utility to collect linux performance d
 mv docs html
 
 # fix EOLs + preserve timestamps
-for f in ARTISTIC GPL
+for f in col2tlviz.pl
 do
     sed -i.orig 's/\r//g' $f
     touch -r $f.orig $f
@@ -50,17 +50,17 @@ mkdir -p        $RPM_BUILD_ROOT%{_initrd
                 $RPM_BUILD_ROOT%{_sysconfdir} \
                 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
                 $RPM_BUILD_ROOT%{_bindir} \
-                $RPM_BUILD_ROOT%{_libexecdir}/%{name} \
+                $RPM_BUILD_ROOT%{_datadir}/%{name}/utils \
                 $RPM_BUILD_ROOT%{_mandir}/man1/ \
                 $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 
 # install the files, setting the mode
-
-ln -sf %{_libexecdir}/%{name}/%{name}.pl $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -p -m 755  collectl.pl       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  *.ph              $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  envrules.std      $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 755  readS             $RPM_BUILD_ROOT%{_bindir}
+install -p -m 755  collectl.pl       $RPM_BUILD_ROOT%{_bindir}/collectl
+install -p -m 644  *.ph              $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644  envrules.std      $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 755  readS             $RPM_BUILD_ROOT%{_datadir}/%{name}/utils
+install -p -m 755  col2tlviz.pl      $RPM_BUILD_ROOT%{_datadir}/%{name}/utils
+install -p -m 755  client.pl         $RPM_BUILD_ROOT%{_datadir}/%{name}/utils
 install -p -m 644  man1/collectl*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 755  %{SOURCE1}        $RPM_BUILD_ROOT%{_initrddir}/%{name}
@@ -89,12 +89,16 @@ fi
 %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_bindir}/*
-%{_libexecdir}/%{name}
+%{_datadir}/%{name}
 %{_mandir}/man1/*
 %{_localstatedir}/log/%{name}
 
 
 %changelog
+* Wed Feb 17 2010 Dan Horák <dan[at]danny.cz> 3.4.0-1
+- upgrade to upstream version 3.4.0
+- updated directory layout to match upstream
+
 * Tue Jan  5 2010 Dan Horák <dan[at]danny.cz> 3.3.6-1
 - upgrade to upstream version 3.3.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	5 Jan 2010 09:43:48 -0000	1.13
+++ sources	18 Feb 2010 13:17:24 -0000	1.14
@@ -1 +1 @@
-c959e71b81c99183d5bd4f586cb4376d  collectl-3.3.6.src.tar.gz
+4337ef9eafd8ee7442a03ae934462a91  collectl-3.4.0.src.tar.gz