[ffgtk: 1/3] Update to 0.8.1

[Louis Lagendijk]

commit 93d7e41dc1adf5bbbf4c4a6efca79b9693e3f4a4
Author: Louis Lagendijk <louis at lagendijk.xs4all.nl>
Date:   Thu Jan 26 22:36:36 2012 +0100

    Update to 0.8.1

 ffgtk.spec |   82 ++++++++++++++++++++++++++---------------------------------
 1 files changed, 36 insertions(+), 46 deletions(-)
---
diff --git a/ffgtk.spec b/ffgtk.spec
index 346ecb3..9b8693f 100644
--- a/ffgtk.spec
+++ b/ffgtk.spec
@@ -1,6 +1,6 @@
 Name:           ffgtk
-Version:        0.7.94
-Release:        10%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        A solution for controlling Fritz!Box or compatible routers
 Group:          Applications/Communications
 License:        GPLv2
@@ -9,7 +9,7 @@ Source0:        http://www.tabos.org/ffgtk/download/%{name}-%{version}.tar.bz2
 Source1:        ffgtk-fax.ppd
 Source2:        ffgtk-README.Fedora
 Patch0:         ffgtk-use-old-spooler.patch
-Patch1:         ffgtk-0.7.94-threads-api.patch
+Patch1:         ffgtk-config.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,8 +18,8 @@ BuildRequires:  gtk2-devel gstreamer-devel gstreamer-plugins-base-devel
 BuildRequires:  libcurl-devel dbus-devel dbus-glib-devel 
 Buildrequires:  isdn4k-utils-devel spandsp-devel evolution-data-server-devel
 Buildrequires:  gnome-keyring-devel speex-devel libsndfile-devel  
-Buildrequires:  pulseaudio-libs-devel
-# We no longer use the bundled md5, but an own implementation
+Buildrequires:  pulseaudio-libs-devel glib2-devel
+# We no longer use the bundled md5, but use the glib implementation
 # Provides:       bundled(md5-deutsch)
 ExcludeArch:    s390 s390x
 
@@ -57,13 +57,14 @@ This package contains the gstreamer plugin for ffgtk.
 %prep
 %setup -q
 %patch0 -p1 -b .spooler
-%patch1 -p1 -b .threads-api
+%patch1 -p1 -b .config
+
 install -m644 %{SOURCE2} ./README.Fedora
 
 %build
 ./autogen.sh
 # work around for broken spandsp pkconfig file
-%configure --with-spandsp=/usr
+%configure -with-portaudio=no --with-spandsp=/usr --disable-Werror
 make %{?_smp_mflags} 
 
 %install
@@ -74,41 +75,32 @@ rm -rf %{buildroot}/%{_datarootdir}/icons/ubuntu*
 
 # Install ppd file for cups
 
-mkdir -p %{buildroot}%{_datadir}/cups/model/
-install -m644 %{SOURCE1}  %{buildroot}%{_datadir}/cups/model/
+mkdir -p %{buildroot}/%{_datarootdir}/cups/model/
+install -m644 %{SOURCE1}  %{buildroot}/%{_datarootdir}/cups/model/
 
 # ffgtk-cups is of no use as we use the old spooler
 
 rm %{buildroot}/%{_datarootdir}/ffgtk/ffgtk-cups
 
 %find_lang %{name}
-desktop-file-validate %{buildroot}/%{_datadir}/applications/ffgtk.desktop
+desktop-file-validate %{buildroot}/%{_datarootdir}/applications/ffgtk.desktop
 
 # remove non desirable development libraries
 
-find %{buildroot} -name '*.so' -exec rm -f {} ';'
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %post
 # On first install : create the printer if cupsd is running
-if [ "$1" -eq "1" -a -f "%{_var}/run/cupsd.pid" ]
-then
-    if [ -d /proc/$(cat %{_var}/run/cupsd.pid) ] 
-    then
-        /usr/sbin/lpadmin -p ffgtk-fax -v socket://localhost:9901 -m ffgtk-fax.ppd -E || :
-    fi
+if [ "$1" -eq "1" -a -S "%{_var}/run/cups/cups.sock" ]; then
+    /usr/sbin/lpadmin -p ffgtk-fax -v socket://localhost:9901 -m ffgtk-fax.ppd -E || :
 fi
 
 
 %postun
 # on removal, remove the printer if cupsd is running
-if [ "$1" -eq "0" -a -f "%{_var}/run/cupsd.pid" ]
-then
-    if [ -d /proc/$(cat %{_var}/run/cupsd.pid) ] 
-    then
-        # Delete the printer
-        /usr/sbin/lpadmin -x ffgtk-fax || :
-    fi
+if [ "$1" -eq "0" -a -S "%{_var}/run/cups/cups.sock" ]; then
+    # Delete the printer
+    /usr/sbin/lpadmin -x ffgtk-fax || :
 fi
 
 %files -f %{name}.lang
@@ -118,28 +110,21 @@ fi
 %dir %{_datarootdir}/ffgtk/areacodes_germany.csv
 %dir %{_libdir}/ffgtk
 %dir %{_libdir}/ffgtk/plugins
-%{_libdir}/ffgtk/plugins/lib_ab_fritzfon.so.0
-%{_libdir}/ffgtk/plugins/lib_ab_fritzfon.so.0.0.0
-%{_libdir}/ffgtk/plugins/lib_ab_fritzfon_v1.so.0
-%{_libdir}/ffgtk/plugins/lib_ab_fritzfon_v1.so.0.0.0
-%{_libdir}/ffgtk/plugins/lib_ab_speedfon.so.0
-%{_libdir}/ffgtk/plugins/lib_ab_speedfon.so.0.0.0
-%{_libdir}/ffgtk/plugins/lib_ab_local.so.0
-%{_libdir}/ffgtk/plugins/lib_ab_local.so.0.0.0
-%{_libdir}/ffgtk/plugins/lib_ab_thunderbird.so.0
-%{_libdir}/ffgtk/plugins/lib_ab_thunderbird.so.0.0.0
-%{_libdir}/ffgtk/plugins/lib_ab_vcard.so.0
-%{_libdir}/ffgtk/plugins/lib_ab_vcard.so.0.0.0
-%{_libdir}/ffgtk/plugins/lib_pwd_gnome.so.0
-%{_libdir}/ffgtk/plugins/lib_pwd_gnome.so.0.0.0
-%{_libdir}/ffgtk/plugins/lib_audio_pulse.so.0
-%{_libdir}/ffgtk/plugins/lib_audio_pulse.so.0.0.0
+%{_libdir}/ffgtk/plugins/lib_ab_fritzfon.so
+%{_libdir}/ffgtk/plugins/lib_ab_fritzfon_v1.so
+%{_libdir}/ffgtk/plugins/lib_ab_speedfon.so
+%{_libdir}/ffgtk/plugins/lib_ab_local.so
+%{_libdir}/ffgtk/plugins/lib_ab_thunderbird.so
+%{_libdir}/ffgtk/plugins/lib_ab_vcard.so
+%{_libdir}/ffgtk/plugins/lib_pwd_gnome.so
+%{_libdir}/ffgtk/plugins/lib_audio_pulse.so
 %{_datarootdir}/applications/ffgtk.desktop
 %{_datarootdir}/ffgtk/actions.ui
 %{_datarootdir}/ffgtk/addaddress.ui
 %{_datarootdir}/ffgtk/assistant.ui
-%{_datarootdir}/ffgtk/sendsms.ui
 %{_datarootdir}/ffgtk/book.ui
+%{_datarootdir}/ffgtk/dtmf.ui
+%{_datarootdir}/ffgtk/sendsms.ui
 %{_datarootdir}/ffgtk/call_in.wav
 %{_datarootdir}/ffgtk/call_out.wav
 %{_datarootdir}/ffgtk/callin.png
@@ -158,24 +143,29 @@ fi
 %{_datarootdir}/ffgtk/notification-message-ffgtk-in.svg
 %{_datarootdir}/ffgtk/notification-message-ffgtk-out.svg
 %{_datarootdir}/icons/hicolor/scalable/apps/ffgtk.svg
+%{_datarootdir}/ffgtk/ffgtk.png
 %{_datarootdir}/pixmaps/ffgtk.png
 %{_mandir}/man1/ffgtk.1.gz
-%{_datadir}/cups/model/ffgtk-fax.ppd
+%{_datarootdir}/cups/model/ffgtk-fax.ppd
 %doc README AUTHORS ChangeLog COPYING README.Fedora 
 
 %files plugin-evolution 
 %defattr(-,root,root,-)
-%{_libdir}/ffgtk/plugins/lib_ab_ebook.so.0
-%{_libdir}/ffgtk/plugins/lib_ab_ebook.so.0.0.0
+%{_libdir}/ffgtk/plugins/lib_ab_ebook.so
 
 %files plugin-capifax
 
 %files plugin-gstreamer
 %defattr(-,root,root,-)
-%{_libdir}/ffgtk/plugins/lib_audio_gstreamer.so.0
-%{_libdir}/ffgtk/plugins/lib_audio_gstreamer.so.0.0.0
+%{_libdir}/ffgtk/plugins/lib_audio_gstreamer.so
 
 %changelog
+* Thu Jan 26 2012 Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.1-1
+- New upstream release 0.8.1, lots of bugfixes
+- Fixed printer creation for cups with a systemd unit file (BZ#768640)A
+- glib patches were incomplete. Compile using new --disable-Werror flag
+  for configure 
+
 * Mon Nov 28 2011 Milan Crha <mcrha at redhat.com> 0.7.94-10
 - Rebuild against newer evolution-data-server