[mingw-gtk-vnc: 18/22] Enable debuginfo subpackage and various cleanups

[epienbro]

commit c6a99cabeac42d47e54ecb76c25cc1df2ec043d3
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Feb 2 16:59:59 2012 +0100

    Enable debuginfo subpackage and various cleanups
    
    - Enable debuginfo subpackage
    - Dropped unneeded RPM tags
    - Dropped .la files
    - Dropped the %%{?fedora} >= 15 conditionals

 mingw32-gtk-vnc.spec |   55 +++++++++++++++++--------------------------------
 1 files changed, 19 insertions(+), 36 deletions(-)
---
diff --git a/mingw32-gtk-vnc.spec b/mingw32-gtk-vnc.spec
index b1685d9..c647ce1 100644
--- a/mingw32-gtk-vnc.spec
+++ b/mingw32-gtk-vnc.spec
@@ -1,42 +1,31 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
-
-%define with_gtk3 0
-%if 0%{?fedora} >= 15
-%define with_gtk3 1
-%endif
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name: mingw32-gtk-vnc
 Version: 0.5.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: MinGW Windows port of VNC client GTK widget
 
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc/0.5/gtk-vnc-%{version}.tar.xz
 URL: http://live.gnome.org/gtk-vnc
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
-BuildRequires: mingw32-filesystem >= 40
+BuildRequires: mingw32-filesystem >= 68
 BuildRequires: mingw32-gcc
 BuildRequires: mingw32-binutils
 
 BuildRequires: mingw32-cairo
-BuildRequires: mingw32-dlfcn
 BuildRequires: mingw32-gettext
 BuildRequires: mingw32-win-iconv
 BuildRequires: mingw32-gnutls
 BuildRequires: mingw32-gtk2
 BuildRequires: pkgconfig
 BuildRequires: intltool
-%if %{with_gtk3}
 BuildRequires: mingw32-gtk3
-%endif
 
 Requires: pkgconfig
 
@@ -47,13 +36,11 @@ Summary: MinGW Windows port of VNC GObject
 Summary: Command line VNC tools
 Group: Applications/Internet
 
-%if %{with_gtk3}
 %package -n mingw32-gtk-vnc2
 Summary: A GTK3 widget for VNC clients
 Group: Development/Libraries
 
 Requires: pkgconfig
-%endif
 
 %description
 gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
@@ -69,17 +56,17 @@ Provides useful command line utilities for interacting with
 VNC servers. Includes the gvnccapture program for capturing
 screenshots of a VNC desktop
 
-%if %{with_gtk3}
 %description -n mingw32-gtk-vnc2
 gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
 allowing it to be completely asynchronous while remaining single threaded.
-%endif
+
+%{?_mingw32_debug_package}
+
 
 %prep
 %setup -q -n gtk-vnc-%{version} -c
-%if %{with_gtk3}
 cp -a gtk-vnc-%{version} gtk-vnc2-%{version}
-%endif
+
 
 %build
 cd gtk-vnc-%{version}
@@ -87,24 +74,19 @@ cd gtk-vnc-%{version}
 %__make %{?_smp_mflags} V=1
 cd ..
 
-%if %{with_gtk3}
 cd gtk-vnc2-%{version}
 %{_mingw32_configure} --without-python --without-examples --without-sasl --with-gtk=3.0
 %__make %{?_smp_mflags} V=1
 cd ..
-%endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 cd gtk-vnc-%{version}
 make DESTDIR=$RPM_BUILD_ROOT install
 cd ..
-%if %{with_gtk3}
 cd gtk-vnc2-%{version}
 make DESTDIR=$RPM_BUILD_ROOT install
 cd ..
-%endif
 
 # Remove static libraries but DON'T remove *.dll.a files.
 rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtk-vnc-1.0.a
@@ -112,23 +94,20 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtk-vnc-2.0.a
 rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libgvnc-1.0.a
 rm -f $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/gvnccapture.1*
 
-%find_lang gtk-vnc
+# Drop all .la files
+find $RPM_BUILD_ROOT -name "*.la" -delete
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%find_lang gtk-vnc
 
 
 %files -f gtk-vnc.lang
-%defattr(-,root,root)
 %{_mingw32_bindir}/gvncviewer.exe
 %{_mingw32_bindir}/libgtk-vnc-1.0-0.dll
 %{_mingw32_libdir}/libgtk-vnc-1.0.dll.a
-%{_mingw32_libdir}/libgtk-vnc-1.0.la
 %{_mingw32_libdir}/pkgconfig/gtk-vnc-1.0.pc
 %{_mingw32_includedir}/gtk-vnc-1.0
 
 %files -n mingw32-gvnc
-%defattr(-,root,root)
 %doc gtk-vnc-%{version}/AUTHORS
 %doc gtk-vnc-%{version}/ChangeLog
 %doc gtk-vnc-%{version}/ChangeLog-old
@@ -137,22 +116,26 @@ rm -rf $RPM_BUILD_ROOT
 %doc gtk-vnc-%{version}/COPYING.LIB
 %{_mingw32_bindir}/libgvnc-1.0-0.dll
 %{_mingw32_libdir}/libgvnc-1.0.dll.a
-%{_mingw32_libdir}/libgvnc-1.0.la
 %{_mingw32_libdir}/pkgconfig/gvnc-1.0.pc
 %{_mingw32_includedir}/gvnc-1.0
 
 %files -n mingw32-gtk-vnc2
 %{_mingw32_bindir}/libgtk-vnc-2.0-0.dll
 %{_mingw32_libdir}/libgtk-vnc-2.0.dll.a
-%{_mingw32_libdir}/libgtk-vnc-2.0.la
 %{_mingw32_libdir}/pkgconfig/gtk-vnc-2.0.pc
 %{_mingw32_includedir}/gtk-vnc-2.0
 
 %files -n mingw32-gvnc-tools
-%defattr(-,root,root)
 %{_mingw32_bindir}/gvnccapture.exe
 
+
 %changelog
+* Tue Feb 02 2012 Erik van Pienbroek <epienbro at fedoraproejct.org> - 0.5.0-4
+- Enable debuginfo subpackage
+- Dropped unneeded RPM tags
+- Dropped .la files
+- Dropped the %%{?fedora} >= 15 conditionals
+
 * Wed Feb 01 2012 Kalev Lember <kalevlember at gmail.com> - 0.5.0-3
 - Rebuilt for libpng 1.5