From b16526ff99a0e30655400c0f24461eb34bde847e Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Feb 12 2014 11:23:44 +0000 Subject: Update to 1.2.0, add check section - Update source URL to download.augeas.net (RHBZ#996032) --- diff --git a/0001-Shellvars-reinstate-etc-sysconfig-network.patch b/0001-Shellvars-reinstate-etc-sysconfig-network.patch deleted file mode 100644 index c79710e..0000000 --- a/0001-Shellvars-reinstate-etc-sysconfig-network.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d6959e6211dc25040c9dd6bf8d75605a3a6155a0 Mon Sep 17 00:00:00 2001 -From: Dominic Cleal -Date: Thu, 21 Mar 2013 08:45:54 +0000 -Subject: [PATCH] Shellvars: reinstate /etc/sysconfig/network - -Fixes #330, RHBZ#904222, RHBZ#920609 ---- - lenses/shellvars.aug | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug -index 5739e18..0c67f96 100644 ---- a/lenses/shellvars.aug -+++ b/lenses/shellvars.aug -@@ -176,7 +176,6 @@ module Shellvars = - sc_excl "sysstat.ioconf" . - sc_excl "system-config-firewall" . - sc_excl "system-config-securitylevel" . -- sc_excl "network" . - sc_incl "network/config" . - sc_incl "network/dhcp" . - sc_incl "network/dhcp6r" . --- -1.8.2.1 - diff --git a/augeas.spec b/augeas.spec index 8d2fdd0..f29e6f5 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,12 +1,12 @@ Name: augeas -Version: 1.1.0 -Release: 2%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries License: LGPLv2+ URL: http://augeas.net/ -Source0: http://augeas.net/download/%{name}-%{version}.tar.gz +Source0: http://download.augeas.net/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,6 +49,17 @@ The libraries for %{name}. %configure --disable-static make %{?_smp_mflags} +%check +# Disable test-preserve.sh SELinux testing. This fails when run under mock due +# to differing SELinux labelling. +export SKIP_TEST_PRESERVE_SELINUX=1 + +make %{?_smp_mflags} check || { + echo '===== tests/test-suite.log =====' + cat tests/test-suite.log + exit 1 +} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" @@ -90,6 +101,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Wed Feb 12 2014 Dominic Cleal - 1.2.0-1 +- Update to 1.2.0, add check section +- Update source URL to download.augeas.net (RHBZ#996032) + * Sat Aug 03 2013 Fedora Release Engineering - 1.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 44648bc..5597710 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -520ce983457ff9ffa3816bc41a9f328b augeas-1.1.0.tar.gz +dce2f52cbd20f72c7da48e014ad48076 augeas-1.2.0.tar.gz