rpms/glpi-data-injection/devel glpi-data-injection-1.2.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 glpi-data-injection.spec, 1.1, 1.2 sources, 1.2, 1.3
Remi Collet (remi)
fedora-extras-commits at redhat.com
Sat Jul 12 07:48:24 UTC 2008
Author: remi
Update of /cvs/extras/rpms/glpi-data-injection/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4790
Modified Files:
.cvsignore glpi-data-injection.spec sources
Added Files:
glpi-data-injection-1.2.patch
Log Message:
update to 1.2 for glpi 0.71
glpi-data-injection-1.2.patch:
--- NEW FILE glpi-data-injection-1.2.patch ---
Index: inc/plugin_data_injection.config.function.php
===================================================================
--- inc/plugin_data_injection.config.function.php (révision 6827)
+++ inc/plugin_data_injection.config.function.php (copie de travail)
@@ -265,7 +265,7 @@
if (function_exists($function)) {
$function ($type, $params);
}
- } else {
+ } else if (isset($PLUGIN_HOOKS['plugin_types'])){
//Browse all plugins
foreach ($PLUGIN_HOOKS['plugin_types'] as $type => $name) {
$function = 'plugin_' . $name . '_data_injection_' . $hook_name;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 27 Jan 2008 19:32:57 -0000 1.2
+++ .cvsignore 12 Jul 2008 07:47:34 -0000 1.3
@@ -1 +1 @@
-glpi-data_injection-1.1.tar.gz
+glpi-data_injection-1.2.tar.gz
Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/devel/glpi-data-injection.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-data-injection.spec 27 Jan 2008 19:33:46 -0000 1.1
+++ glpi-data-injection.spec 12 Jul 2008 07:47:34 -0000 1.2
@@ -1,7 +1,7 @@
%define pluginname data_injection
Name: glpi-data-injection
-Version: 1.1
+Version: 1.2
Release: 1%{?dist}
Summary: Plugin for importing data into GLPI
Summary(fr): Extension pour importer des données dans GLPI
@@ -12,10 +12,12 @@
Source0: http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz
+Patch0: %{name}-1.2.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: glpi >= 0.70
+Requires: glpi >= 0.71
%description
Plugin for importing data into GLPI
@@ -39,6 +41,10 @@
%prep
%setup -q -c
+pushd %{pluginname}
+%patch0 -p0
+popd
+
# dos2unix to avoid rpmlint warnings
mv %{pluginname}/docs docs
find %{pluginname} -name \*php -exec sed -i -e 's/\r//' {} \;
@@ -59,7 +65,7 @@
do
lang=$(basename $i)
echo "%lang(${lang:0:2}) %{_datadir}/glpi/plugins/%{pluginname}/locales/${lang}"
-done >%{name}.lang
+done | tee %{name}.lang
%clean
rm -rf %{buildroot}
@@ -70,10 +76,12 @@
%doc docs/*
%{_datadir}/glpi/plugins/%{pluginname}
%dir %{_datadir}/glpi/plugins/%{pluginname}/locales
-%{_datadir}/glpi/plugins/%{pluginname}/locales/*
%changelog
+* Sat Jul 12 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.2-1
+- update to 1.2 for glpi 0.71
+
* Sun Jan 13 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.1-1
- update to 1.1
- tag lang files
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 27 Jan 2008 19:32:57 -0000 1.2
+++ sources 12 Jul 2008 07:47:34 -0000 1.3
@@ -1 +1 @@
-e8339290b31627e5107e692dc3c47aae glpi-data_injection-1.1.tar.gz
+697b7e035d3a50a8e1bb4cfa3c6ae267 glpi-data_injection-1.2.tar.gz
More information about the fedora-extras-commits
mailing list