[Unicore-cvs-commits] SF.net SVN: unicore:[16178] hila

[<bj...@us...>]

Revision: 16178
          http://unicore.svn.sourceforge.net/unicore/?rev=16178&view=rev
Author:   bjoernh
Date:     2013-03-28 14:14:44 +0000 (Thu, 28 Mar 2013)
Log Message:
-----------
merging r16177 (rpmlint fixes) into tags and branches

Revision Links:
--------------
    http://unicore.svn.sourceforge.net/unicore/?rev=16177&view=rev

Modified Paths:
--------------
    hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-emi-es/src/main/package/distributions/RedHat/component.spec_template
    hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-gridftp/src/main/package/distributions/RedHat/component.spec_template
    hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-shell/src/main/package/distributions/RedHat/component.spec_template
    hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-unicore6/src/main/package/distributions/RedHat/component.spec_template
    hila/tags/hila-2.4.1-rc1/hila-emi-es/src/main/package/distributions/RedHat/component.spec_template
    hila/tags/hila-2.4.1-rc1/hila-gridftp/src/main/package/distributions/RedHat/component.spec_template
    hila/tags/hila-2.4.1-rc1/hila-shell/src/main/package/distributions/RedHat/component.spec_template
    hila/tags/hila-2.4.1-rc1/hila-unicore6/src/main/package/distributions/RedHat/component.spec_template

Property Changed:
----------------
    hila/branches/hila-2.4.1-rc-SNAPSHOT/
    hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-emi-es/src/main/package/
    hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-gridftp/src/main/package/
    hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-shell/src/main/package/
    hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-unicore6/src/main/package/
    hila/branches/hila-2.4.1-rc-SNAPSHOT/src/site/CHANGELOG
    hila/tags/hila-2.4.1-rc1/
    hila/tags/hila-2.4.1-rc1/hila-emi-es/src/main/package/
    hila/tags/hila-2.4.1-rc1/hila-gridftp/src/main/package/
    hila/tags/hila-2.4.1-rc1/hila-shell/src/main/package/
    hila/tags/hila-2.4.1-rc1/hila-unicore6/src/main/package/
    hila/tags/hila-2.4.1-rc1/src/site/CHANGELOG


Property changes on: hila/branches/hila-2.4.1-rc-SNAPSHOT
___________________________________________________________________
Modified: svn:mergeinfo
   - /hila/branches/hila-2.4.0-rc:15487-15826
/hila/tags/hila-2.3.0-rc:14145,14183,14194,14202
/hila/tags/hila-2.4.0-rc2:15858-15859
/hila/trunk:16160
   + /hila/branches/hila-2.4.0-rc:15487-15826
/hila/tags/hila-2.3.0-rc:14145,14183,14194,14202
/hila/tags/hila-2.4.0-rc2:15858-15859
/hila/trunk:16160,16177


Property changes on: hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-emi-es/src/main/package
___________________________________________________________________
Modified: svn:mergeinfo
   - /hila/branches/hila-2.3/hila-emi-es/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-emi-es/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-emi-es/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-emi-es/src/main/package:15858-15859
/hila/trunk/hila-emi-es/src/main/package:16160
   + /hila/branches/hila-2.3/hila-emi-es/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-emi-es/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-emi-es/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-emi-es/src/main/package:15858-15859
/hila/trunk/hila-emi-es/src/main/package:16160,16177

Modified: hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-emi-es/src/main/package/distributions/RedHat/component.spec_template
===================================================================
--- hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-emi-es/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:06:26 UTC (rev 16177)
+++ hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-emi-es/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:14:44 UTC (rev 16178)
@@ -32,9 +32,10 @@
 
 %dir %attr(755 root root) "/etc/unicore/"
 %dir %attr(755 root root) "/etc/unicore/hila"
-%config %attr(644 root root) "/etc/unicore/hila/emi-es.properties"
+%config(noreplace) %attr(644 root root) "/etc/unicore/hila/emi-es.properties"
 
 %changelog
 
-* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> 2.4.1-0
+* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> @component-version@-@component-release@@component-disttag@
 -- Introduce RPM changelog
+-- change example config file to ordinary file


Property changes on: hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-gridftp/src/main/package
___________________________________________________________________
Modified: svn:mergeinfo
   - /hila/branches/hila-2.3/hila-gridftp/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-gridftp/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-gridftp/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-gridftp/src/main/package:15858-15859
/hila/trunk/hila-gridftp/src/main/package:16160
   + /hila/branches/hila-2.3/hila-gridftp/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-gridftp/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-gridftp/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-gridftp/src/main/package:15858-15859
/hila/trunk/hila-gridftp/src/main/package:16160,16177

Modified: hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-gridftp/src/main/package/distributions/RedHat/component.spec_template
===================================================================
--- hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-gridftp/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:06:26 UTC (rev 16177)
+++ hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-gridftp/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:14:44 UTC (rev 16178)
@@ -32,5 +32,5 @@
 
 %changelog
 
-* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> 2.4.1-0
+* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> @component-version@-@component-release@@component-disttag@
 -- Introduce RPM changelog


Property changes on: hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-shell/src/main/package
___________________________________________________________________
Modified: svn:mergeinfo
   - /hila/branches/hila-2.3/hila-shell/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-shell/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-shell/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-shell/src/main/package:15858-15859
/hila/trunk/hila-shell/src/main/package:16160
   + /hila/branches/hila-2.3/hila-shell/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-shell/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-shell/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-shell/src/main/package:15858-15859
/hila/trunk/hila-shell/src/main/package:16160,16177

Modified: hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-shell/src/main/package/distributions/RedHat/component.spec_template
===================================================================
--- hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-shell/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:06:26 UTC (rev 16177)
+++ hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-shell/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:14:44 UTC (rev 16178)
@@ -16,7 +16,7 @@
 %description
 The HiLA Grid API is an abstract API for accessing Grid resources.
 
-This package contains the HiLA Shell, an interactive shell to acess
+This package contains the HiLA Shell, an interactive shell to access
 Grid resources.
 
 @install_command@
@@ -59,5 +59,5 @@
 
 %changelog
 
-* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> 2.4.1-0
+* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> @component-version@-@component-release@@component-disttag@
 -- Introduce RPM changelog


Property changes on: hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-unicore6/src/main/package
___________________________________________________________________
Modified: svn:mergeinfo
   - /hila/branches/hila-2.3/hila-unicore6/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-unicore6/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-unicore6/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-unicore6/src/main/package:15858-15859
/hila/trunk/hila-unicore6/src/main/package:16160
   + /hila/branches/hila-2.3/hila-unicore6/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-unicore6/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-unicore6/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-unicore6/src/main/package:15858-15859
/hila/trunk/hila-unicore6/src/main/package:16160,16177

Modified: hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-unicore6/src/main/package/distributions/RedHat/component.spec_template
===================================================================
--- hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-unicore6/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:06:26 UTC (rev 16177)
+++ hila/branches/hila-2.4.1-rc-SNAPSHOT/hila-unicore6/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:14:44 UTC (rev 16178)
@@ -31,9 +31,10 @@
 
 %dir %attr(755 root root) "/etc/unicore/"
 %dir %attr(755 root root) "/etc/unicore/hila"
-%config %attr(644 root root) "/etc/unicore/hila/unicore6.properties"
+%config(noreplace) %attr(644 root root) "/etc/unicore/hila/unicore6.properties"
 
 %changelog
 
-* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> 2.4.1-0
+* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> @component-version@-@component-release@@component-disttag@
 -- Introduce RPM changelog
+-- change example config file to ordinary file


Property changes on: hila/branches/hila-2.4.1-rc-SNAPSHOT/src/site/CHANGELOG
___________________________________________________________________
Modified: svn:mergeinfo
   - /hila/branches/hila-2.4.0-rc/src/site/CHANGELOG:15487-15826
/hila/tags/hila-2.3.0-rc/src/site/CHANGELOG:14145,14183,14191,14194,14202
/hila/tags/hila-2.4.0-rc2/src/site/CHANGELOG:15858-15859
/hila/trunk/src/site/CHANGELOG:14191,16160
   + /hila/branches/hila-2.4.0-rc/src/site/CHANGELOG:15487-15826
/hila/tags/hila-2.3.0-rc/src/site/CHANGELOG:14145,14183,14191,14194,14202
/hila/tags/hila-2.4.0-rc2/src/site/CHANGELOG:15858-15859
/hila/trunk/src/site/CHANGELOG:14191,16160,16177


Property changes on: hila/tags/hila-2.4.1-rc1
___________________________________________________________________
Modified: svn:mergeinfo
   - /hila/branches/hila-2.4.0-rc:15487-15826
/hila/tags/hila-2.3.0-rc:14145,14183,14194,14202
/hila/tags/hila-2.4.0-rc2:15858-15859
/hila/trunk:16160
   + /hila/branches/hila-2.4.0-rc:15487-15826
/hila/tags/hila-2.3.0-rc:14145,14183,14194,14202
/hila/tags/hila-2.4.0-rc2:15858-15859
/hila/trunk:16160,16177


Property changes on: hila/tags/hila-2.4.1-rc1/hila-emi-es/src/main/package
___________________________________________________________________
Modified: svn:mergeinfo
   - /hila/branches/hila-2.3/hila-emi-es/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-emi-es/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-emi-es/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-emi-es/src/main/package:15858-15859
/hila/trunk/hila-emi-es/src/main/package:16160
   + /hila/branches/hila-2.3/hila-emi-es/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-emi-es/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-emi-es/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-emi-es/src/main/package:15858-15859
/hila/trunk/hila-emi-es/src/main/package:16160,16177

Modified: hila/tags/hila-2.4.1-rc1/hila-emi-es/src/main/package/distributions/RedHat/component.spec_template
===================================================================
--- hila/tags/hila-2.4.1-rc1/hila-emi-es/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:06:26 UTC (rev 16177)
+++ hila/tags/hila-2.4.1-rc1/hila-emi-es/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:14:44 UTC (rev 16178)
@@ -32,9 +32,10 @@
 
 %dir %attr(755 root root) "/etc/unicore/"
 %dir %attr(755 root root) "/etc/unicore/hila"
-%config %attr(644 root root) "/etc/unicore/hila/emi-es.properties"
+%config(noreplace) %attr(644 root root) "/etc/unicore/hila/emi-es.properties"
 
 %changelog
 
-* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> 2.4.1-0
+* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> @component-version@-@component-release@@component-disttag@
 -- Introduce RPM changelog
+-- change example config file to ordinary file


Property changes on: hila/tags/hila-2.4.1-rc1/hila-gridftp/src/main/package
___________________________________________________________________
Modified: svn:mergeinfo
   - /hila/branches/hila-2.3/hila-gridftp/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-gridftp/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-gridftp/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-gridftp/src/main/package:15858-15859
/hila/trunk/hila-gridftp/src/main/package:16160
   + /hila/branches/hila-2.3/hila-gridftp/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-gridftp/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-gridftp/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-gridftp/src/main/package:15858-15859
/hila/trunk/hila-gridftp/src/main/package:16160,16177

Modified: hila/tags/hila-2.4.1-rc1/hila-gridftp/src/main/package/distributions/RedHat/component.spec_template
===================================================================
--- hila/tags/hila-2.4.1-rc1/hila-gridftp/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:06:26 UTC (rev 16177)
+++ hila/tags/hila-2.4.1-rc1/hila-gridftp/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:14:44 UTC (rev 16178)
@@ -32,5 +32,5 @@
 
 %changelog
 
-* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> 2.4.1-0
+* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> @component-version@-@component-release@@component-disttag@
 -- Introduce RPM changelog


Property changes on: hila/tags/hila-2.4.1-rc1/hila-shell/src/main/package
___________________________________________________________________
Modified: svn:mergeinfo
   - /hila/branches/hila-2.3/hila-shell/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-shell/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-shell/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-shell/src/main/package:15858-15859
/hila/trunk/hila-shell/src/main/package:16160
   + /hila/branches/hila-2.3/hila-shell/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-shell/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-shell/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-shell/src/main/package:15858-15859
/hila/trunk/hila-shell/src/main/package:16160,16177

Modified: hila/tags/hila-2.4.1-rc1/hila-shell/src/main/package/distributions/RedHat/component.spec_template
===================================================================
--- hila/tags/hila-2.4.1-rc1/hila-shell/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:06:26 UTC (rev 16177)
+++ hila/tags/hila-2.4.1-rc1/hila-shell/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:14:44 UTC (rev 16178)
@@ -16,7 +16,7 @@
 %description
 The HiLA Grid API is an abstract API for accessing Grid resources.
 
-This package contains the HiLA Shell, an interactive shell to acess
+This package contains the HiLA Shell, an interactive shell to access
 Grid resources.
 
 @install_command@
@@ -59,5 +59,5 @@
 
 %changelog
 
-* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> 2.4.1-0
+* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> @component-version@-@component-release@@component-disttag@
 -- Introduce RPM changelog


Property changes on: hila/tags/hila-2.4.1-rc1/hila-unicore6/src/main/package
___________________________________________________________________
Modified: svn:mergeinfo
   - /hila/branches/hila-2.3/hila-unicore6/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-unicore6/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-unicore6/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-unicore6/src/main/package:15858-15859
/hila/trunk/hila-unicore6/src/main/package:16160
   + /hila/branches/hila-2.3/hila-unicore6/src/main/package:13054-13055
/hila/branches/hila-2.4.0-rc/hila-unicore6/src/main/package:15487-15826
/hila/tags/hila-2.3.0-rc/hila-unicore6/src/main/package:13061-14179,14183,14194,14202
/hila/tags/hila-2.4.0-rc2/hila-unicore6/src/main/package:15858-15859
/hila/trunk/hila-unicore6/src/main/package:16160,16177

Modified: hila/tags/hila-2.4.1-rc1/hila-unicore6/src/main/package/distributions/RedHat/component.spec_template
===================================================================
--- hila/tags/hila-2.4.1-rc1/hila-unicore6/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:06:26 UTC (rev 16177)
+++ hila/tags/hila-2.4.1-rc1/hila-unicore6/src/main/package/distributions/RedHat/component.spec_template	2013-03-28 14:14:44 UTC (rev 16178)
@@ -31,9 +31,10 @@
 
 %dir %attr(755 root root) "/etc/unicore/"
 %dir %attr(755 root root) "/etc/unicore/hila"
-%config %attr(644 root root) "/etc/unicore/hila/unicore6.properties"
+%config(noreplace) %attr(644 root root) "/etc/unicore/hila/unicore6.properties"
 
 %changelog
 
-* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> 2.4.1-0
+* Tue Mar 26 2013 Björn Hagemeier <b.h...@fz...> @component-version@-@component-release@@component-disttag@
 -- Introduce RPM changelog
+-- change example config file to ordinary file


Property changes on: hila/tags/hila-2.4.1-rc1/src/site/CHANGELOG
___________________________________________________________________
Modified: svn:mergeinfo
   - /hila/branches/hila-2.4.0-rc/src/site/CHANGELOG:15487-15826
/hila/tags/hila-2.3.0-rc/src/site/CHANGELOG:14145,14183,14191,14194,14202
/hila/tags/hila-2.4.0-rc2/src/site/CHANGELOG:15858-15859
/hila/trunk/src/site/CHANGELOG:14191,16160
   + /hila/branches/hila-2.4.0-rc/src/site/CHANGELOG:15487-15826
/hila/tags/hila-2.3.0-rc/src/site/CHANGELOG:14145,14183,14191,14194,14202
/hila/tags/hila-2.4.0-rc2/src/site/CHANGELOG:15858-15859
/hila/trunk/src/site/CHANGELOG:14191,16160,16177

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.