From 83b1965b37ea4c9d412a008a7b543a13c531c95e Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <[email protected]>
Date: Tue, 2 Feb 2016 15:19:43 +0100
Subject: Replace %%define by %%global
---
perl-SystemPerl.spec | 33 ++++++++++++++-------------------
1 file changed, 14 insertions(+), 19 deletions(-)
diff --git a/perl-SystemPerl.spec b/perl-SystemPerl.spec
index 423fe0f..7a3a840 100644
--- a/perl-SystemPerl.spec
+++ b/perl-SystemPerl.spec
@@ -1,18 +1,18 @@
# If the emacs-el package has installed a pkgconfig file, use that to
determine
# install locations and Emacs version at build time, otherwise set defaults.
%if %($(pkg-config emacs) ; echo $?)
-%define emacs_version 22.1
-%define emacs_lispdir %{_datadir}/emacs/site-lisp
-%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
+%global emacs_version 22.1
+%global emacs_lispdir %{_datadir}/emacs/site-lisp
+%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
-%define emacs_version %{expand:%(pkg-config emacs --modversion)}
-%define emacs_lispdir %{expand:%(pkg-config emacs --variable sitepkglispdir)}
-%define emacs_startdir %{expand:%(pkg-config emacs --variable sitestartdir)}
+%global emacs_version %{expand:%(pkg-config emacs --modversion)}
+%global emacs_lispdir %{expand:%(pkg-config emacs --variable sitepkglispdir)}
+%global emacs_startdir %{expand:%(pkg-config emacs --variable sitestartdir)}
%endif
Name: perl-SystemPerl
Version: 1.344
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: SystemPerl Perl module
License: LGPLv3+ or Artistic 2.0
@@ -20,7 +20,6 @@ Group: Development/Libraries
URL: http://www.veripool.org/wiki/systemperl
Source0:
http://www.cpan.org/authors/id/W/WS/WSNYDER/SystemPerl-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: SystemPerl-1.344-example.patch
BuildRequires: bison
@@ -55,7 +54,7 @@ BuildRequires: perl(warnings)
BuildRequires: perl(Cwd)
BuildRequires: perl(Test)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
+Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: perl(Pod::Usage) >= 1.34
Requires: perl(Verilog::Getopt) >= 2.211
Requires: perl(Verilog::Netlist) >= 3.200
@@ -102,9 +101,9 @@ developing applications that use %{name}.
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
# Build emacs mode
emacs -batch -f batch-byte-compile systemc-mode.el
@@ -115,13 +114,10 @@ EOF
%install
-rm -rf $RPM_BUILD_ROOT
-
-%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
%{_fixperms} $RPM_BUILD_ROOT/*
@@ -144,9 +140,6 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {}
2>/dev/null \;
make test
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%license COPYING
%doc Changes README
@@ -165,11 +158,13 @@ rm -rf $RPM_BUILD_ROOT
%{emacs_startdir}/systemc-mode.el
%files devel
-%defattr(-,root,root,-)
%{_includedir}/%{name}/
%changelog
+* Tue Feb 02 2016 Jitka Plesnikova <[email protected]> - 1.344-3
+- Replace %%define by %%global
+
* Thu Oct 08 2015 Jitka Plesnikova <[email protected]> - 1.344-2
- Moved emacs sub-packages into main package (bug #1234551)
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/perl-SystemPerl.git/commit/?h=master&id=83b1965b37ea4c9d412a008a7b543a13c531c95e
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
[email protected]
http://lists.fedoraproject.org/admin/lists/[email protected]
