perfsonar development work

Author: dfn.calim
Date: 2011-09-09 14:03:28 +0100 (Fri, 09 Sep 2011)
New Revision: 738

Removed:
   branches/perfsonar-oppd-all-0.53/build/perfSONAR/oppd-MDM.spec
   branches/perfsonar-oppd-all-0.53/build/perfSONAR/perl-perfSONAR.spec
Modified:
   branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
   branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.SKIP
Log:
add new rpm package for bug fix

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST   2011-09-09 
13:01:38 UTC (rev 737)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST   2011-09-09 
13:03:28 UTC (rev 738)
@@ -9,8 +9,7 @@
 etc/LS_register.xml
 etc/oppd-mdm.conf
 etc/oppd.conf.example
-etc/oppd.init.debian
-etc/oppd.default.debian
+etc/oppd.init.redhat
 etc/oppd.sysconfig.redhat
 lib/perfSONAR.pm
 lib/perfSONAR/Auth.pm
@@ -32,7 +31,6 @@
 Makefile.PL
 MANIFEST                       This list of files
 META.yml
-prepare-oppd-debian.pl
 README
 t/00-load.t
 t/perfSONAR-001-SOAP-Message.t

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.SKIP
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.SKIP      
2011-09-09 13:01:38 UTC (rev 737)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.SKIP      
2011-09-09 13:03:28 UTC (rev 738)
@@ -38,9 +38,17 @@
 # Avoid archives of this distribution
 \bperfsonar-oppd-[\d\.\_]+
 
-#Build debian packages so avoid redhat specific files
-\bredhat
-\bspec
+#avoid redhat specific files
+#for debian package 
+#\bredhat
+#\bspec
 
+#avoid debian specific files
+#for rpm package 
+\bdebian
+
+
+
+
 #All ege because this is MDM
 \bege

Deleted: branches/perfsonar-oppd-all-0.53/build/perfSONAR/oppd-MDM.spec
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/oppd-MDM.spec      
2011-09-09 13:01:38 UTC (rev 737)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/oppd-MDM.spec      
2011-09-09 13:03:28 UTC (rev 738)
@@ -1,161 +0,0 @@
-%define install_base /usr/lib/perfsonar/services/oppd
-
-Name:           perfsonar-oppd
-Version:        0.51
-Release:        1
-Summary:        open Perl perfSONAR daemon and perl modules
-License:        BSD
-Group:          Development/Libraries
-URL:            http://search.cpan.org/dist/perfSONAR/
-#Source0:        
http://www.cpan.org/modules/by-module/perfSONAR/perfSONAR-%{version}.tar.gz
-Source0:       oppd-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} 
-n)
-BuildArch:      noarch
-BuildRequires:  perl(Config::General)
-BuildRequires:  perl(HTTP::Daemon)
-BuildRequires:  perl(HTTP::Request)
-BuildRequires:  perl(HTTP::Response)
-BuildRequires:  perl(IPC::Shareable)
-BuildRequires:  perl(Log::Dispatch)
-BuildRequires:  perl(Log::Dispatch::File)
-BuildRequires:  perl(Log::Dispatch::Screen)
-BuildRequires:  perl(Log::Dispatch::Syslog)
-BuildRequires:  perl(LWP::UserAgent)
-BuildRequires:  perl(Module::Build)
-#BuildRequires:  perl(NMWG)
-#BuildRequires:  perl(NMWG::Message)
-BuildRequires:  perl(URI)
-BuildRequires:  perl(XML::LibXML)
-BuildRequires:  perl(XML::LibXML::NodeList)
-Requires:       perl(Config::General)
-Requires:       perl(HTTP::Daemon)
-Requires:       perl(HTTP::Request)
-Requires:       perl(HTTP::Response)
-Requires:       perl(IPC::Shareable)
-Requires:       perl(Log::Dispatch)
-Requires:       perl(Log::Dispatch::File)
-Requires:       perl(Log::Dispatch::Screen)
-Requires:       perl(Log::Dispatch::Syslog)
-Requires:       perl(LWP::UserAgent)
-Requires:       perl(NMWG) >= 0.02
-Requires:       perl(NMWG::Message)
-Requires:       perl(URI)
-Requires:       perl(XML::LibXML)
-Requires:       perl(XML::LibXML::NodeList)
-#Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo 
$version))
-Obsoletes:      oppd
-Obsoletes:      oppd-mp-bwctl
-
-%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 --install_base=%install_base
-./Build
-
-%pre
-/usr/sbin/groupadd perfsonar 2> /dev/null || :
-/usr/sbin/useradd -g perfsonar -s /sbin/nologin -c "perfsonar user" -d / 
perfsonar 2> /dev/null || :
-mkdir -p %install_base
-chown perfsonar:perfsonar %install_base
-
-%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
-
-%post
-/sbin/chkconfig --add oppd
-if [ "$1" -ge 2 ]; then
-ln -s %install_base/etc/oppd.conf /etc/oppd.conf
-fi
-ln -s %install_base/doc /usr/share/doc/%{name}-%{version}/
-
-%preun
-if [ "$1" = 0 ] ; then
-/sbin/service oppd stop > /dev/null 2>&1
-/sbin/chkconfig --del oppd
-rm -rf /etc/oppd.conf
-rm -rf /usr/share/doc/%{name}-%{version}/
-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}/man1/*
-#%{_bindir}/oppd.pl
-%{install_base}/*
-%config /etc/init.d/oppd
-#%config %install_base/etc/oppd.conf
-
-%changelog
-* Thu Jul 02 2009 Verena Venus
-- Changed Release to 1 added obsoletes
-  for old oppd packages
-* Wed May 06 2009 Verena Venus
-- Changed Release to 0.rc2.MDM_3.1.1
-* Mon Mar 09 2009 Verena Venus
-- Changed Release to 0.rc1.MDM_3.1.1
-* Fri Feb 20 2009 Verena Venus
-- Changed Release to MDM_3.1.1
-- Changed Version to 0.51
-* Mon Nov 03 2008 Verena Venus
-- Changed Release to MDM_3.1
-* Tue Oct 28 2008 Verena Venus
-- Changed doc/oppd to doc/oppd-%{version}
-- Changed Release to RC7
-* Wed Oct 01 2008 Verena Venus
-- Added %post, %preun and %postun for chkconfig and
-  adding/delting links
-- Changed Release to RC6
-- Changed install_base from /opt/perfsonar/services
-  to /usr/lib/perfsonar/services
-- kicked out obsolete sed command for oppd.redhat
-* Tue Sep 16 2008 Verena Venus
-- Changed Release to RC5.MDM_perfSONAR_3_1.fc7
-* Tue Jul 29 2008 Verena Venus
-- Changed Name to oppd
-- Changed Release to RC4
-- Changed Version to 0.5
-* Mon Jul 14 2008 Verena Venus
-- Changed Release to RC2.MDM_perfSONAR_3_1.fc7
-* Wed May 28 2008 Verena Venus
-- Changed Release to MDM_perfSONAR_3_1.fc7
-- Changed Version to 0.41
-* Tue Apr 15 2008 Verena Venus
-- Changed Release to RC5.MDM_perfSONAR_3.fc7
-* Mon Apr 14 2008 Verena Venus
-- changed install_base from /home/perfsonar/webapps
-  to /opt/perfsonar/services
-* Wed Mar 12 2008 Verena Venus
-- Changed Release to RC4.MDM_perfSONAR_3.fc7
-- Changed %defattr from root to perfsonar user
-* Thu Mar 06 2008 Verena Venus
-- Changed Release to RC3.MDM_perfSONAR_3.fc7
-* Wed Jan 16 2008 Verena Venus
-- Changed to match MDM requirements
-* Mon Jan 14 2008 DFN-Labor 0.4-1
-- Specfile autogenerated by cpanspec 1.73.

Deleted: branches/perfsonar-oppd-all-0.53/build/perfSONAR/perl-perfSONAR.spec
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/perl-perfSONAR.spec      
  2011-09-09 13:01:38 UTC (rev 737)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/perl-perfSONAR.spec      
  2011-09-09 13:03:28 UTC (rev 738)
@@ -1,79 +0,0 @@
-Name:           perl-perfSONAR
-Version:        0.4
-Release:        1%{?dist}
-Summary:        perfSONAR Perl module
-License:        BSD
-Group:          Development/Libraries
-URL:            http://search.cpan.org/dist/perfSONAR/
-Source0:        
http://www.cpan.org/modules/by-module/perfSONAR/perfSONAR-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} 
-n)
-BuildArch:      noarch
-BuildRequires:  perl(Config::General)
-BuildRequires:  perl(HTTP::Daemon)
-BuildRequires:  perl(HTTP::Request)
-BuildRequires:  perl(HTTP::Response)
-BuildRequires:  perl(IPC::Shareable)
-BuildRequires:  perl(Log::Dispatch)
-BuildRequires:  perl(Log::Dispatch::File)
-BuildRequires:  perl(Log::Dispatch::Screen)
-BuildRequires:  perl(Log::Dispatch::Syslog)
-BuildRequires:  perl(LWP::UserAgent)
-BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(NMWG)
-BuildRequires:  perl(NMWG::Message)
-BuildRequires:  perl(URI)
-BuildRequires:  perl(XML::LibXML)
-BuildRequires:  perl(XML::LibXML::NodeList)
-Requires:       perl(Config::General)
-Requires:       perl(HTTP::Daemon)
-Requires:       perl(HTTP::Request)
-Requires:       perl(HTTP::Response)
-Requires:       perl(IPC::Shareable)
-Requires:       perl(Log::Dispatch)
-Requires:       perl(Log::Dispatch::File)
-Requires:       perl(Log::Dispatch::Screen)
-Requires:       perl(Log::Dispatch::Syslog)
-Requires:       perl(LWP::UserAgent)
-Requires:       perl(NMWG)
-Requires:       perl(NMWG::Message)
-Requires:       perl(URI)
-Requires:       perl(XML::LibXML)
-Requires:       perl(XML::LibXML::NodeList)
-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 perfSONAR-%{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
-
-%files
-%defattr(-,root,root,-)
-%doc Changes README
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
-
-%changelog
-* Wed Jan 16 2008 DFN-Labor 0.4-1
-- Specfile autogenerated by cpanspec 1.73.