Accepting request 306064 from Application:Geo

1

OBS-URL: https://build.opensuse.org/request/show/306064
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/geotiff?expand=0&rev=2

geotiff.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat May  9 09:05:53 UTC 2015 - mpluskal@suse.com
+
+- Do not build or ship static libraries and .la files
+- Remove useless conditions
+
 -------------------------------------------------------------------
 Sat Jan 31 17:38:30 UTC 2015 - mpluskal@suse.com
 

geotiff.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package geotiff
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,14 +26,12 @@ Url:            http://trac.osgeo.org/geotiff
 Source0:        ftp://ftp.remotesensing.org/pub/%{name}/lib%{name}/lib%{name}-%{version}.tar.gz
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
+BuildRequires:  graphviz
 BuildRequires:  libjpeg-devel
 BuildRequires:  libproj-devel
 BuildRequires:  libtiff-devel
+BuildRequires:  pkg-config
 BuildRequires:  zlib-devel
-%if 0%{?suse_version}
-BuildRequires:	pkg-config
-BuildRequires:	graphviz
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -97,17 +95,13 @@ export CXXFLAGS="%{optflags} $CXXFLAGS -g -fstack-protector -fno-strict-aliasing
 	--with-jpeg \
 	--with-zip \
 	--with-pic \
+	--enable-static=no \
 	--enable-debug=yes
 
 make %{?_smp_mflags}
 
 %install
-%if 0%{?suse_version}
 make DESTDIR=%{buildroot} install %{?_smp_mflags} INSTALL="install -p"
-%else
-%makeinstall INSTALL="%{__install} -p" \
-   includedir=%{buildroot}/%{_includedir}/lib%{name}
-%endif
 
 # install pkgconfig file
 cat > libgeotiff.pc <<EOF
@@ -128,6 +122,9 @@ install -p -m 644 lib%{name}.pc %{buildroot}%{_libdir}/pkgconfig
 
 echo  >> %{buildroot}%{_datadir}/epsg_csv/codes.csv
 
+# do not ship la files
+find %{buildroot}%{_libdir} -name "*.la" -delete -print
+
 %post -n lib%{name}2 -p /sbin/ldconfig
 
 %postun -n lib%{name}2 -p /sbin/ldconfig
@@ -156,8 +153,6 @@ echo  >> %{buildroot}%{_datadir}/epsg_csv/codes.csv
 %dir %{_includedir}/lib%{name}
 %{_includedir}/lib%{name}/*.h
 %{_includedir}/lib%{name}/*.inc
-%{_libdir}/lib%{name}.a
-%{_libdir}/lib%{name}.la
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/lib%{name}.pc