perfsonar development work

Author: dfn.calim
Date: 2010-10-14 10:58:10 +0100 (Thu, 14 Oct 2010)
New Revision: 656

Added:
   
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/etc/oppd-hades.conf.example
   
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/perfsonar-oppd-ma-hades.spec
Removed:
   branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/DEBIAN/
   
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/etc/oppd-bwctl.conf.example
   
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/lib/perfSONAR/BWCTL.pm
   branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/lib/perfSONAR/MP/
   
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/perfsonar-oppd-mp-bwctl.spec
   
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/prepare-bwctl-mp-debian.pl
Log:
Preparing Build files for HADES MA

Deleted: 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/etc/oppd-bwctl.conf.example
===================================================================
--- 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/etc/oppd-bwctl.conf.example
       2010-10-14 09:01:43 UTC (rev 655)
+++ 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/etc/oppd-bwctl.conf.example
       2010-10-14 09:58:10 UTC (rev 656)
@@ -1 +0,0 @@
-link ../../../etc/oppd-egee/oppd.d/bwctl.conf
\ No newline at end of file

Added: 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/etc/oppd-hades.conf.example
===================================================================
--- 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/etc/oppd-hades.conf.example
                               (rev 0)
+++ 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/etc/oppd-hades.conf.example
       2010-10-14 09:58:10 UTC (rev 656)
@@ -0,0 +1 @@
+link ../../../etc/oppd.d.example/hades.conf
\ No newline at end of file


Property changes on: 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/etc/oppd-hades.conf.example
___________________________________________________________________
Name: svn:special
   + *

Deleted: 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/lib/perfSONAR/BWCTL.pm
===================================================================
--- 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/lib/perfSONAR/BWCTL.pm
    2010-10-14 09:01:43 UTC (rev 655)
+++ 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/lib/perfSONAR/BWCTL.pm
    2010-10-14 09:58:10 UTC (rev 656)
@@ -1 +0,0 @@
-link ../../../../lib/perfSONAR/BWCTL.pm
\ No newline at end of file

Copied: 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/perfsonar-oppd-ma-hades.spec
 (from rev 655, 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/perfsonar-oppd-mp-bwctl.spec)
===================================================================
--- 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/perfsonar-oppd-ma-hades.spec
                              (rev 0)
+++ 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/perfsonar-oppd-ma-hades.spec
      2010-10-14 09:58:10 UTC (rev 656)
@@ -0,0 +1,88 @@
+Name:           perfsonar-oppd-mp-bwctl
+Version:        0.51
+Release:        2egee
+Summary:        perfSONAR::MP::BWCTL Perl module
+License:        Apache
+Group:          Development/Libraries
+URL:            http://search.cpan.org/dist/perfSONAR-MP-BWCTL/
+#Source0:        
http://www.cpan.org/modules/by-module/perfSONAR/perfSONAR-MP-BWCTL-%{version}.tar.gz
+Source0:       %{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} 
-n)
+BuildArch:      noarch
+#BuildRequires:  perl(IO::Tty) >= 1.02
+#BuildRequires:  perl(IPC::Run)
+#BuildRequires:  perl(Module::Build)
+#BuildRequires:  perl(perfSONAR) >= 0.4
+Requires:       perl(IO::Tty) >= 1.02
+Requires:       perl(IPC::Run)
+Requires:       perl(perfSONAR) >= 0.51
+Requires:       perfsonar-oppd >= 0.51
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo 
$version))
+
+%description
+The README is used to introduce the module and provide instructions on how
+to install the module, any machine dependencies it may have (for example C
+compilers and installed libraries) and any other information that should be
+provided before the module is installed.
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+%{__perl} Build.PL installdirs=vendor
+./Build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} $RPM_BUILD_ROOT/*
+
+%check
+#./Build test
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+#%pre
+#if test -e /etc/oppd.d/oppd-bwctl.conf.removed ; then
+#mv /etc/oppd.d/oppd-bwctl.conf.removed /etc/oppd.d/oppd-bwctl.conf
+#fi
+
+%post
+#ln -s %install_base/etc/oppd-bwctl.conf /etc/oppd-bwctl.conf
+#echo "include oppd-bwctl.conf" >> /etc/oppd.conf
+chown perfsonar:perfsonar /etc/oppd.d/oppd-bwctl.conf
+
+%preun
+if [ "$1" = 0 ] ; then
+/sbin/service oppd stop > /dev/null 2>&1
+mv /etc/oppd.d/oppd-bwctl.conf /etc/oppd.d/oppd-bwctl.conf.removed
+fi
+exit 0
+
+%postun
+if [ "$1" -ge 1 ]; then
+/sbin/service oppd condrestart > /dev/null 2>&1
+fi
+exit 0
+
+
+%files
+%defattr(-,perfsonar,perfsonar,-)
+%doc Changes README
+%{perl_vendorlib}/*
+#%{_mandir}/man3/*
+#%{install_base}/*
+%config(noreplace) /etc/oppd.d/oppd-bwctl.conf
+
+%changelog
+* Thu Oct 29 2009 DFN Labor
+- updated release tag
+* Tue Jun 23 2009 Verena Venus
+- derived Version from MDM spec, changed install path to vendor
+- changed release to 0.beta
+* Wed Jan 16 2008 DFN-Labor 0.4-1
+- Specfile autogenerated by cpanspec 1.73.

Deleted: 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/perfsonar-oppd-mp-bwctl.spec
===================================================================
--- 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/perfsonar-oppd-mp-bwctl.spec
      2010-10-14 09:01:43 UTC (rev 655)
+++ 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/perfsonar-oppd-mp-bwctl.spec
      2010-10-14 09:58:10 UTC (rev 656)
@@ -1,88 +0,0 @@
-Name:           perfsonar-oppd-mp-bwctl
-Version:        0.51
-Release:        2egee
-Summary:        perfSONAR::MP::BWCTL Perl module
-License:        Apache
-Group:          Development/Libraries
-URL:            http://search.cpan.org/dist/perfSONAR-MP-BWCTL/
-#Source0:        
http://www.cpan.org/modules/by-module/perfSONAR/perfSONAR-MP-BWCTL-%{version}.tar.gz
-Source0:       %{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} 
-n)
-BuildArch:      noarch
-#BuildRequires:  perl(IO::Tty) >= 1.02
-#BuildRequires:  perl(IPC::Run)
-#BuildRequires:  perl(Module::Build)
-#BuildRequires:  perl(perfSONAR) >= 0.4
-Requires:       perl(IO::Tty) >= 1.02
-Requires:       perl(IPC::Run)
-Requires:       perl(perfSONAR) >= 0.51
-Requires:       perfsonar-oppd >= 0.51
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo 
$version))
-
-%description
-The README is used to introduce the module and provide instructions on how
-to install the module, any machine dependencies it may have (for example C
-compilers and installed libraries) and any other information that should be
-provided before the module is installed.
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-%{__perl} Build.PL installdirs=vendor
-./Build
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
-
-%check
-#./Build test
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-#%pre
-#if test -e /etc/oppd.d/oppd-bwctl.conf.removed ; then
-#mv /etc/oppd.d/oppd-bwctl.conf.removed /etc/oppd.d/oppd-bwctl.conf
-#fi
-
-%post
-#ln -s %install_base/etc/oppd-bwctl.conf /etc/oppd-bwctl.conf
-#echo "include oppd-bwctl.conf" >> /etc/oppd.conf
-chown perfsonar:perfsonar /etc/oppd.d/oppd-bwctl.conf
-
-%preun
-if [ "$1" = 0 ] ; then
-/sbin/service oppd stop > /dev/null 2>&1
-mv /etc/oppd.d/oppd-bwctl.conf /etc/oppd.d/oppd-bwctl.conf.removed
-fi
-exit 0
-
-%postun
-if [ "$1" -ge 1 ]; then
-/sbin/service oppd condrestart > /dev/null 2>&1
-fi
-exit 0
-
-
-%files
-%defattr(-,perfsonar,perfsonar,-)
-%doc Changes README
-%{perl_vendorlib}/*
-#%{_mandir}/man3/*
-#%{install_base}/*
-%config(noreplace) /etc/oppd.d/oppd-bwctl.conf
-
-%changelog
-* Thu Oct 29 2009 DFN Labor
-- updated release tag
-* Tue Jun 23 2009 Verena Venus
-- derived Version from MDM spec, changed install path to vendor
-- changed release to 0.beta
-* Wed Jan 16 2008 DFN-Labor 0.4-1
-- Specfile autogenerated by cpanspec 1.73.

Deleted: 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/prepare-bwctl-mp-debian.pl
===================================================================
--- 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/prepare-bwctl-mp-debian.pl
        2010-10-14 09:01:43 UTC (rev 655)
+++ 
branches/perfsonar-oppd-all-0.52/build/perfSONAR-MA-HADES/prepare-bwctl-mp-debian.pl
        2010-10-14 09:58:10 UTC (rev 656)
@@ -1,47 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use File::Path;
-
-my $mp_version = "0.5"; #version of bwctl mp
-my $package_path = "oppd-mp-bwctl-$mp_version";
-my $install_path = "usr/lib/perfsonar/services/oppd/lib/perfSONAR";
-
-
-`rm -rf $package_path`;
-mkpath("$package_path");
-`tar zcvfh lib.tgz lib/* --exclude .svn`;
-`mv lib.tgz $package_path`;
-
-
-chdir("$package_path");
-`tar zxvf lib.tgz`;
-`rm -rf lib.tgz`;
-
-mkpath("usr/share/doc/oppd-mp-bwctl");
-mkpath("$install_path");
-mkpath("$install_path/MP");
-
-`mv lib/perfSONAR/* $install_path`;
-#`mv lib/perfSONAR/MP/* $install_path/MP`;
-
-`cp -R ../DEBIAN .`;
-`mv DEBIAN/changelog.Debian.gz DEBIAN/copyright 
usr/share/doc/oppd-mp-bwctl/`;
-`rm -rf DEBIAN/.svn`;
-
-`rm -rf lib/`;
-
-=cut
-opendir(DIR, ".") || die "cannot open directory . $!\n";
-my @files = grep !/^\./, readdir DIR;
-foreach my $file (@files){
-  next if (-d $file);
-  `mv $file usr/lib/perfsonar/services/oppd/geant2-perl-bwctl-mp/`;
-}
-=cut
-
-chdir("..");
-`rm -rf $package_path-debian.tgz`;
-`tar zcvf $package_path-debian.tgz $package_path`;