Attachment 1287 Details for Bug 2129 – svn diff

[patch] svn diff

svndiff (text/plain), 2.95 KB, created by Barry Jackson on 2011-12-23 22:04:10 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Barry Jackson

Created: 2011-12-23 22:04:10 CET

Size: 2.95 KB

patch

obsolete

>Index: SPECS/ocsinventory.spec
>===================================================================
>--- SPECS/ocsinventory.spec	(revision 186663)
>+++ SPECS/ocsinventory.spec	(working copy)
>@@ -1,16 +1,19 @@
>-%define _requires_exceptions pear(dbconfig.inc.php)\\|pear(composants.php)\\|pear(dico.php)
>-%define schema_version 1.3
>+%define _requires_exceptions pear(dbconfig.inc.php)\\|pear(composants.php)\\|pear(dico.php)\\\
>+|pear(opt_pack.php)\\|pear(jpgraph_glayout_vh.inc.php)\\|pear(jpgraph/jpgraph.php)\\\
>+|pear(opt_sup.php)\\|opt_groups.php\\|pear(jpgraph/jpgraph_canvas.php)\\|pear(domxml-php4-to-php5.php)\\\
>+|pear(jpgraph/jpgraph_barcode.php)
> 
>+%define schema_version 2.0
>+
> Name:		ocsinventory
>-Version:	1.3.3
>+Version:	2.0.3
> Release:	%mkrel 1
> Summary:	Open Computer and Software Inventory Next Generation
>-License:	GPL
>+License:	GPLv2
> Group:		System/Servers
> URL:		http://www.ocsinventory-ng.org/ 
>-Source0:	http://launchpad.net/ocsinventory-server/stable-1.3/server-release-1.3/+download/OCSNG_UNIX_SERVER-%{version}.tar.gz
>-BuildArch:  noarch
>-BuildRoot:	%{_tmppath}/%{name}-%{version}
>+Source0:	http://launchpad.net/ocsinventory-server/stable-%{version}/%{version}/+download/OCSNG_UNIX_SERVER-%{version}.tar.gz
>+BuildArch:	noarch
> 
> %description
> Open Computer and Software Inventory Next Generation is an application
>@@ -23,27 +26,25 @@
> OCS Inventory NG includes package deployment feature on client computers
> 
> %package server
>-Group:      System/Servers
>-Summary:    Communication server
>+Group:		System/Servers
>+Summary:	Communication server
> Requires:	apache-mod_perl
> Requires:	perl(Apache::DBI)
>-Requires:   perl-DBD-mysql
>-Requires:   perl-Net-IP
>-Requires:   perl-SOAP-Lite
>-Obsoletes:  ocsng-linux-server
>+Requires:	perl-DBD-mysql
>+Requires:	perl-Net-IP
>+Requires:	perl-SOAP-Lite
> 
> %description server
> This package provides the Communication server, which will handle HTTP
> communications between database server and agents.
> 
> %package reports
>-Group:      System/Servers
>-Summary:    Administration console
>+Group:		System/Servers
>+Summary:	Administration console
> Requires:	apache-mod_php
> Requires:	php-mysql
> Requires:	php-xml
> Requires:	php-zip
>-Obsoletes:  ocsng-linux-server
> 
> %description reports
> This package provides the Administration console, which will allow 
>@@ -60,9 +61,6 @@
> %make
> 
> %install
>-rm -rf  %{buildroot}
>-
>-
> # ocsinventory-server
> pushd Apache
> make pure_install PERL_INSTALL_ROOT=%{buildroot}
>@@ -122,11 +120,7 @@
>     -e 's|PATH_TO_PACKAGES_DIR|%{_localstatedir}/lib/ocsinventory-reports/download|;' \
>     %{buildroot}%{_webappconfdir}/ocsinventory-reports.conf 
> 
>-%clean
>-rm -rf %{buildroot}
>-
> %files server
>-%defattr(-,root,root)
> %doc README LICENSE.txt Apache/Changes
> %{perl_vendorlib}/Apache
> %attr(-,apache,apache) %{_localstatedir}/log/ocsinventory-server
>@@ -142,4 +136,3 @@
> %attr(660,root,apache) %config(noreplace) %{_sysconfdir}/ocsinventory/ocsreports/dbconfig.inc.php
> %attr(-,apache,apache) %{_localstatedir}/lib/ocsinventory-reports
> 
>-

Index: SPECS/ocsinventory.spec
===================================================================
--- SPECS/ocsinventory.spec	(revision 186663)
+++ SPECS/ocsinventory.spec	(working copy)
@@ -1,16 +1,19 @@
-%define _requires_exceptions pear(dbconfig.inc.php)\\|pear(composants.php)\\|pear(dico.php)
-%define schema_version 1.3
+%define _requires_exceptions pear(dbconfig.inc.php)\\|pear(composants.php)\\|pear(dico.php)\\\
+|pear(opt_pack.php)\\|pear(jpgraph_glayout_vh.inc.php)\\|pear(jpgraph/jpgraph.php)\\\
+|pear(opt_sup.php)\\|opt_groups.php\\|pear(jpgraph/jpgraph_canvas.php)\\|pear(domxml-php4-to-php5.php)\\\
+|pear(jpgraph/jpgraph_barcode.php)
 
+%define schema_version 2.0
+
 Name:		ocsinventory
-Version:	1.3.3
+Version:	2.0.3
 Release:	%mkrel 1
 Summary:	Open Computer and Software Inventory Next Generation
-License:	GPL
+License:	GPLv2
 Group:		System/Servers
 URL:		http://www.ocsinventory-ng.org/ 
-Source0:	http://launchpad.net/ocsinventory-server/stable-1.3/server-release-1.3/+download/OCSNG_UNIX_SERVER-%{version}.tar.gz
-BuildArch:  noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}
+Source0:	http://launchpad.net/ocsinventory-server/stable-%{version}/%{version}/+download/OCSNG_UNIX_SERVER-%{version}.tar.gz
+BuildArch:	noarch
 
 %description
 Open Computer and Software Inventory Next Generation is an application
@@ -23,27 +26,25 @@
 OCS Inventory NG includes package deployment feature on client computers
 
 %package server
-Group:      System/Servers
-Summary:    Communication server
+Group:		System/Servers
+Summary:	Communication server
 Requires:	apache-mod_perl
 Requires:	perl(Apache::DBI)
-Requires:   perl-DBD-mysql
-Requires:   perl-Net-IP
-Requires:   perl-SOAP-Lite
-Obsoletes:  ocsng-linux-server
+Requires:	perl-DBD-mysql
+Requires:	perl-Net-IP
+Requires:	perl-SOAP-Lite
 
 %description server
 This package provides the Communication server, which will handle HTTP
 communications between database server and agents.
 
 %package reports
-Group:      System/Servers
-Summary:    Administration console
+Group:		System/Servers
+Summary:	Administration console
 Requires:	apache-mod_php
 Requires:	php-mysql
 Requires:	php-xml
 Requires:	php-zip
-Obsoletes:  ocsng-linux-server
 
 %description reports
 This package provides the Administration console, which will allow 
@@ -60,9 +61,6 @@
 %make
 
 %install
-rm -rf  %{buildroot}
-
-
 # ocsinventory-server
 pushd Apache
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
@@ -122,11 +120,7 @@
     -e 's|PATH_TO_PACKAGES_DIR|%{_localstatedir}/lib/ocsinventory-reports/download|;' \
     %{buildroot}%{_webappconfdir}/ocsinventory-reports.conf 
 
-%clean
-rm -rf %{buildroot}
-
 %files server
-%defattr(-,root,root)
 %doc README LICENSE.txt Apache/Changes
 %{perl_vendorlib}/Apache
 %attr(-,apache,apache) %{_localstatedir}/log/ocsinventory-server
@@ -142,4 +136,3 @@
 %attr(660,root,apache) %config(noreplace) %{_sysconfdir}/ocsinventory/ocsreports/dbconfig.inc.php
 %attr(-,apache,apache) %{_localstatedir}/lib/ocsinventory-reports
 
-

Actions: View | Diff

Attachments on bug 2129: 1287