From 3787e9af96ae050f01b26c90c0a17974f20c49ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Fri, 25 Dec 2015 16:50:15 +0100
Subject: [PATCH] spec cleanup

---
 ogdi.spec | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/ogdi.spec b/ogdi.spec
index 8fdfb4d..e6278f0 100644
--- a/ogdi.spec
+++ b/ogdi.spec
@@ -8,7 +8,6 @@ URL:            http://ogdi.sourceforge.net/
 Source0:        http://dl.sourceforge.net/ogdi/%{name}-%{version}.beta2.tar.gz
 Source1:        http://ogdi.sourceforge.net/ogdi.pdf
 Patch0:         ogdi-3.2.0.beta2-projfix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRequires:  unixODBC-devel zlib-devel
 BuildRequires:  expat-devel proj-devel tcl-devel
@@ -23,6 +22,7 @@ geospatial data products over any TCP/IP network, and a
 driver-oriented approach to facilitate access to several geospatial
 data products/formats.
 
+
 %package devel
 Summary:        OGDI header files and documentation
 Group:          Development/Libraries
@@ -33,6 +33,7 @@ Requires:       zlib-devel expat-devel proj-devel
 %description devel
 OGDI header files and developer's documentation.
 
+
 %package odbc
 Summary:        ODBC driver for OGDI
 Group:          System Environment/Libraries
@@ -41,6 +42,7 @@ Requires:       %{name} = %{version}-%{release}
 %description odbc
 ODBC driver for OGDI.
 
+
 %package tcl
 Summary:        TCL wrapper for OGDI
 Group:          System Environment/Libraries
@@ -49,6 +51,7 @@ Requires:       %{name} = %{version}-%{release}
 %description tcl
 TCL wrapper for OGDI.
 
+
 %prep
 %setup -q -n %{name}-%{version}.beta2
 %patch0 -p1 -b .projfix
@@ -56,8 +59,8 @@ TCL wrapper for OGDI.
 # include documentation
 cp -p %{SOURCE1} .
 
-%build
 
+%build
 TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET
 INST_LIB=%{_libdir}/;export INST_LIB
 export CFG=debug # for -g
@@ -73,7 +76,7 @@ export CFLAGS="$OPT_FLAGS -fPIC -DPIC -DDONT_TD_VOID -DUSE_TERMIO"
 
 # WARNING !!!
 # using %{?_smp_mflags} may break build
-make 
+make
 
 # build tcl interface
 make -C ogdi/tcl_interface \
@@ -87,9 +90,8 @@ ODBC_LINKLIB="-lodbc"
 make -C ogdi/attr_driver/odbc \
           ODBC_LINKLIB="-lodbc"
 
-%install
-rm -rf %{buildroot}
 
+%install
 # export env
 TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET
 
@@ -111,9 +113,9 @@ rm %{buildroot}%{_bindir}/example?
 
 # we have multilib ogdi-config
 %if "%{_lib}" == "lib"
-%define cpuarch 32
+%global cpuarch 32
 %else
-%define cpuarch 64
+%global cpuarch 64
 %endif
 
 # fix file(s) for multilib issue
@@ -129,7 +131,7 @@ cat > %{buildroot}%{_bindir}/%{name}-config <<EOF
 
 ARCH=\$(uname -m)
 case \$ARCH in
-x86_64 | ppc64 | ia64 | s390x | sparc64 | alpha | alphaev6 )
+x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 )
 ogdi-config-64 \${*}
 ;;
 *)
@@ -140,14 +142,12 @@ EOF
 chmod 755 %{buildroot}%{_bindir}/%{name}-config
 touch -r ogdi-config.in %{buildroot}%{_bindir}/%{name}-config
 
-%clean
-rm -rf %{buildroot}
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files
-%defattr(-,root,root,-)
 %doc LICENSE NEWS ChangeLog README
 %{_bindir}/gltpd
 %{_bindir}/ogdi_*
@@ -158,7 +158,6 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/lib*.so
 
 %files devel
-%defattr(-,root,root,-)
 %doc ogdi.pdf
 %doc ogdi/examples/example1/example1.c
 %doc ogdi/examples/example2/example2.c
@@ -170,13 +169,12 @@ rm -rf %{buildroot}
 %{_libdir}/libogdi.so
 
 %files odbc
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/liblodbc.so
 
 %files tcl
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libecs_tcl.so
 
+
 %changelog
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.0-0.25.beta2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild