From 64a4cc98823f0e8b81298c8e41e121e9f78ada39 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <[email protected]>
Date: Tue, 6 Jun 2017 10:04:56 +0200
Subject: Update to latest upstream release
Drop patches applied upstream
---
.gitignore | 1 +
fusioninventory-agent-setup.pm.patch | 41 ------------------------------------
fusioninventory-agent.spec | 17 ++++++---------
sources | 2 +-
4 files changed, 8 insertions(+), 53 deletions(-)
delete mode 100644 fusioninventory-agent-setup.pm.patch
diff --git a/.gitignore b/.gitignore
index a7d0d83..f8cca5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/2.3.18.tar.gz
/FusionInventory-Agent-2.3.18.tar.gz
/FusionInventory-Agent-2.3.19.tar.gz
+/FusionInventory-Agent-2.3.20.tar.gz
diff --git a/fusioninventory-agent-setup.pm.patch
b/fusioninventory-agent-setup.pm.patch
deleted file mode 100644
index 045dd9d..0000000
--- a/fusioninventory-agent-setup.pm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/bin/setup.pm b/bin/setup.pm
-index 3f92279..c7132f0 100644
---- a/bin/setup.pm
-+++ b/bin/setup.pm
-@@ -8,30 +8,11 @@ our @EXPORT = ('%setup');
-
- our %setup;
-
--# From here we can setup @INC so any needed perl module can be found. We add
--# as many 'use lib' directive as needed
--# We could also define '%setup' hash while useful
--
--# Here is a sample working from sources directory or its bin subfolder
--if (-d 'lib') {
-- use lib './lib' ;
--
-- %setup = (
-- confdir => './etc',
-- datadir => './share',
-- libdir => './lib',
-- vardir => './var',
-- );
--
--} elsif (-d '../lib') {
-- use lib '../lib';
--
-- %setup = (
-- confdir => '../etc',
-- datadir => '../share',
-- libdir => '../lib',
-- vardir => '../var',
-- );
--}
-+%setup = (
-+ confdir => 'CONFDIR',
-+ datadir => 'DATADIR',
-+ libdir => 'LIBDIR',
-+ vardir => 'VARDIR',
-+);
-
- 1;
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 333bb18..adc64f1 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,14 +9,13 @@ Group: Applications/System
License: GPLv2+
URL: http://fusioninventory.org/
-Version: 2.3.19
-Release: 2%{?dist}
+Version: 2.3.20
+Release: 1%{?dist}
Source0:
https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
Source1: %{name}.cron
#Use systemd override capabilities
Source10: %{name}.service
Source11: %{name}.service.conf
-Patch0: %{name}-setup.pm.patch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -151,14 +150,6 @@ FusionInventory agent
%prep
%setup -q -n FusionInventory-Agent-%{version}
-%patch0 -p1
-sed \
- -e "s|CONFDIR|%{_sysconfdir}/fusioninventory|" \
- -e "s|DATADIR|%{_datarootdir}/fusioninventory|" \
- -e "s|LIBDIR|%{_datarootdir}/fusioninventory/lib|" \
- -e "s|VARDIR|%{_sharedstatedir}/fusioninventory|" \
- -i bin/setup.pm
-
# This work only on older version, and is ignored on recent
cat <<EOF | tee %{name}-req
#!/bin/sh
@@ -324,6 +315,10 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf
%{buildroot}%{_sysconfdir}/yum
%changelog
+* Tue Jun 06 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.20-1
+- Last upstream release
+- Drop patches, upstream has provided fixes
+
* Mon Feb 20 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.19-2
- Fix setup.pm values
diff --git a/sources b/sources
index 6877158..2adf09a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FusionInventory-Agent-2.3.19.tar.gz) =
438b2df00d82ae272106ce5f3bb5006afe58e67651f566e7d1b3c1f4a508f0f523dca7f01dfad73f845b537de7c3a51fdaf09a9d098a955cfce331b2f8d2aaa1
+SHA512 (FusionInventory-Agent-2.3.20.tar.gz) =
3037a6af26e9b670c249a95755891c9bbd77ade50b4ec3c0cbcbd8b61085e2181414d2e74d6f7351806165ccde47b02b2a4aa5f91b5f0649577ee2d6f8d6c717
--
cgit v1.1
https://src.fedoraproject.org/cgit/fusioninventory-agent.git/commit/?h=f24&id=64a4cc98823f0e8b81298c8e41e121e9f78ada39
_______________________________________________
perl-devel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
