diff --git a/perl-SystemC-Vregs.spec b/perl-SystemC-Vregs.spec index 14ac076..b0502d3 100644 --- a/perl-SystemC-Vregs.spec +++ b/perl-SystemC-Vregs.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-SystemC-Vregs Version: 1.470 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Utility routines used by vregs License: LGPLv3+ or Artistic 2.0 @@ -20,7 +20,6 @@ Group: Development/Libraries URL: http://search.cpan.org/dist/SystemC-Vregs/ Source0: http://www.cpan.org/authors/id/W/WS/WSNYDER/SystemC-Vregs-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: coreutils @@ -54,7 +53,7 @@ BuildRequires: sed # ExtUtils::Manifest # perl(Test) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Verilog::Language) >= 2.1 # Remove under-specified dependencies @@ -84,17 +83,14 @@ This package provides emacs support for systemc-vregs %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %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 \; emacs -batch -f batch-byte-compile vregs-mode.el %{__install} -d %{buildroot}%{emacs_lispdir} @@ -105,9 +101,6 @@ emacs -batch -f batch-byte-compile vregs-mode.el %check # make test -%clean -rm -rf $RPM_BUILD_ROOT - %files %license COPYING %doc Changes README vregs_spec.doc vregs_spec.htm @@ -128,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 02 2016 Jitka Plesnikova - 1.470-10 +- Replace %%define by %%global + * Fri Oct 23 2015 Petr Pisar - 1.470-9 - Correct dependency filter - Specify all dependencies