From 94e451272470427c75712b93815f4a7c4a40d40d Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar@redhat.com>
Date: Jan 26 2016 11:39:13 +0000
Subject: Modernize spec file


---

diff --git a/perl-Gnome2-GConf.spec b/perl-Gnome2-GConf.spec
index c7cc594..ea190ea 100644
--- a/perl-Gnome2-GConf.spec
+++ b/perl-Gnome2-GConf.spec
@@ -1,6 +1,6 @@
 Name:           perl-Gnome2-GConf
 Version:        1.044
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        Perl wrappers for the GConf configuration engine
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -9,19 +9,37 @@ Source0:        http://www.cpan.org/modules/by-module/Gnome2/Gnome2-GConf-%{vers
 # Remove support for gconf_engine_key_is_writable() which has been removed
 # from GConf2, bug #1197692, CPAN RT#91577
 Patch0:         Gnome2-GConf-1.044-disable-orbit.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-## core
-BuildRequires:  perl(Test::More)
-## non-core
-BuildRequires:  perl(Glib) >= 1.120, perl(Glib::MakeHelper), GConf2
+BuildRequires:  coreutils
+BuildRequires:  findutils
+BuildRequires:  make
+BuildRequires:  perl
+BuildRequires:  perl(Cwd)
 BuildRequires:  perl(ExtUtils::Depends) >= 0.2
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(ExtUtils::PkgConfig) >= 1.03
+BuildRequires:  perl(File::Spec)
+BuildRequires:  pkgconfig(gconf-2.0) >= 2.0.0
+BuildRequires:  perl(Glib) >= 1.120
+BuildRequires:  perl(Glib::CodeGen)
+BuildRequires:  perl(Glib::MakeHelper)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Run-time:
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(DynaLoader)
+BuildRequires:  perl(overload)
+# Tests:
+# The tests need D-Bus with X11
+BuildRequires:  dbus-x11
+BuildRequires:  font(:lang=en)
+BuildRequires:  perl(constant)
+BuildRequires:  perl(Test::More)
+BuildRequires:  xorg-x11-server-Xvfb
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires:       perl(Glib) >= 1.120
 
-BuildRequires:  GConf2-devel
-
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
+# Filter under-specified dependencies
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Glib\\)$
 
 %description
 This module allows you to use the GConf configuration system in order to
@@ -30,47 +48,34 @@ powerful configuration manager based on a user daemon that handles a set of
 key and value pairs, and notifies any changes of the value to every program
 that monitors those keys. GConf is used by GNOME 2.x.
 
-
 %prep
 %setup -q -n Gnome2-GConf-%{version}
 %patch0 -p1
 
-
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
 
-cp xs/* .
-
 %install
-rm -rf %{buildroot}
-
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
-
+make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
 find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
-
 %{_fixperms} %{buildroot}/*
 
-
 %check
-%{?_with_network_tests: make test }
-
-
-%clean
-rm -rf %{buildroot}
-
+xvfb-run -a make test
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHOR ChangeLog doctypes gconf.typemap maps NEWS README examples/ t/
+%doc AUTHOR ChangeLog copyright.pod NEWS README examples
 %{perl_vendorarch}/auto/*
 %{perl_vendorarch}/Gnome2*
 %{_mandir}/man3/*
 
 
 %changelog
+* Tue Jan 26 2016 Petr Pisar <ppisar@redhat.com> - 1.044-25
+- Modernize spec file
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.044-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
@@ -162,7 +167,7 @@ Rebuild for new perl
 
 * Fri Aug 18 2006 Chris Weyl <cweyl@alumni.drew.edu> 1.032-2
 - added missing BR
-- tweaked %build to help -debuginfo generation
+- tweaked %%build to help -debuginfo generation
 
 * Sun Aug 13 2006 Chris Weyl <cweyl@alumni.drew.edu> 1.032-1
 - Specfile autogenerated by cpanspec 1.68.