From dbd306f29f600b2da3b6d0c5cb3ec2ae41f40d59 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Feb 01 2014 18:40:40 +0000
Subject: 4.15.4-2


- -macros: use %_rpmconfigdir/macros.d (where supported)
- .spec cleanup

---

diff --git a/sip.spec b/sip.spec
index f6d360f..5388770 100644
--- a/sip.spec
+++ b/sip.spec
@@ -8,21 +8,21 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?python_inc:%global python_inc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")}
 
+%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+
 # trim changelog included in binary rpms
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.15.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison)
 License: GPLv2 or GPLv3 and (GPLv3+ with exceptions)
-Group: Development/Tools
 Url: http://www.riverbankcomputing.com/software/sip/intro 
 #URL: http://sourceforge.net/projects/pyqt/
 Source0:  http://downloads.sourceforge.net/pyqt/sip-%{version}%{?snap:-snapshot-%{snap}}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
 # make install should not strip (by default), kills -debuginfo
@@ -59,7 +59,6 @@ class library.
 
 %package devel
 Summary: Files needed to generate Python bindings for any C++ class library
-Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}-macros = %{version}-%{release}
 Requires: python-devel 
@@ -69,7 +68,6 @@ classes library.
 
 %package macros
 Summary: RPM macros for use when working with SIP
-Group: Development/Tools
 Requires: rpm
 %description macros
 This package contains RPM macros for use when working with SIP.
@@ -80,7 +78,6 @@ It is used by both the sip-devel (python 2) and python3-sip-devel subpackages.
 %if 0%{?with_python3}
 %package -n python3-sip
 Summary: SIP - Python 3/C++ Bindings Generator
-Group: Development/Tools
 Provides: python3-sip-api(%{_sip_api_major}) = %{_sip_api}
 Provides: python3-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
 %description -n python3-sip
@@ -98,7 +95,6 @@ class library.
 
 %package -n python3-sip-devel
 Summary: Files needed to generate Python 3 bindings for any C++ class library
-Group: Development/Libraries
 Requires: %{name}-macros = %{version}-%{release}
 Requires: python3-sip%{?_isa} = %{version}-%{release}
 Requires: python3-devel
@@ -136,8 +132,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 # Perform the Python 3 installation first, to avoid stomping over the Python 2
 # /usr/bin/sip:
 %if 0%{?with_python3}
@@ -153,36 +147,27 @@ make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{_datadir}/sip
 
 # Macros used by -devel subpackages:
-install -D -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.sip
-
-
-%clean
-rm -rf %{buildroot}
+install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip
 
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE LICENSE-GPL2 LICENSE-GPL3
 %doc NEWS README
 %{python_sitearch}/*
 
 %files devel
-%defattr(-,root,root,-)
 %{_bindir}/sip
 %{_datadir}/sip/
 %{python_inc}/*
 
 %files macros
-%defattr(-,root,root,-)
-%{_sysconfdir}/rpm/macros.sip
+%{rpm_macros_dir}/macros.sip
 
 %if 0%{?with_python3}
 %files -n python3-sip
-%defattr(-,root,root,-)
 %{python3_sitearch}/*
 
 %files -n python3-sip-devel
-%defattr(-,root,root,-)
 # Note that the "sip" binary is invoked by name in a few places higher up
 # in the KDE-Python stack; these will need changing to "python3-sip":
 %{_bindir}/python3-sip
@@ -192,6 +177,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Feb 01 2014 Rex Dieter <rdieter@fedoraproject.org> 4.15.4-2
+- -macros: use %%_rpmconfigdir/macros.d (where supported)
+- .spec cleanup
+
 * Wed Jan 08 2014 Rex Dieter <rdieter@fedoraproject.org> 4.15.4-1
 - sip-4.15.4