[ffgtk: 1/2] new upstream release 0.7.94

Louis Lagendijk llagendijk at fedoraproject.org
Sat Jun 25 13:16:45 UTC 2011 

commit f125e076a7547a0a487c192a6dc986aff9d54714
Author: Louis Lagendijk <louis at lagendijk.xs4all.nl>
Date:   Sat Jun 25 15:12:21 2011 +0200

    new upstream release 0.7.94

 .gitignore                  |    1 +
 ffgtk-libexec.patch         |   64 -----------------
 ffgtk-license.txt           |  115 ------------------------------
 ffgtk-no-Werror.patch       |  162 -------------------------------------------
 ffgtk-use-old-spooler.patch |   36 ++--------
 ffgtk.spec                  |   72 +++++++++++--------
 sources                     |    2 +-
 7 files changed, 49 insertions(+), 403 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0096a4..241608e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ffgtk-0.7.8.tar.bz2
+/ffgtk-0.7.94.tar.bz2
diff --git a/ffgtk-use-old-spooler.patch b/ffgtk-use-old-spooler.patch
index ec83369..f61cdae 100644
--- a/ffgtk-use-old-spooler.patch
+++ b/ffgtk-use-old-spooler.patch
@@ -1,8 +1,8 @@
-diff -r -C 4 ffgtk-0.7.8/ffgtk/main.c ffgtk-0.7.8.patched/ffgtk/main.c
-*** ffgtk-0.7.8/ffgtk/main.c	2010-11-17 23:54:14.000000000 +0100
---- ffgtk-0.7.8.patched/ffgtk/main.c	2010-12-22 23:34:02.000000000 +0100
+diff -r -C 4 ffgtk-0.7.94.org/ffgtk/main.c ffgtk-0.7.94/ffgtk/main.c
+*** ffgtk-0.7.94.org/ffgtk/main.c	2011-05-13 18:45:04.000000000 +0200
+--- ffgtk-0.7.94/ffgtk/main.c	2011-06-11 23:36:45.000000000 +0200
 ***************
-*** 211,219 ****
+*** 221,229 ****
   	DiversityLoad();
   	/* Start call-monitor port thread */
   	InitMonitor();
@@ -12,37 +12,13 @@ diff -r -C 4 ffgtk-0.7.8/ffgtk/main.c ffgtk-0.7.8.patched/ffgtk/main.c
   	PrintServerInit();
   #else
   	/* Initialize new fax spool watcher */
---- 211,219 ----
+--- 221,229 ----
   	DiversityLoad();
   	/* Start call-monitor port thread */
   	InitMonitor();
   
-! #if defined(__MACOSX__) || defined(USE_OLD_SPOOLER)
+! #if TRUE
   	/* Start old cups printer waitqueue */
   	PrintServerInit();
   #else
   	/* Initialize new fax spool watcher */
-diff -r -C 4 ffgtk-0.7.8/ffgtk/Makefile.am ffgtk-0.7.8.patched/ffgtk/Makefile.am
-*** ffgtk-0.7.8/ffgtk/Makefile.am	2010-11-17 23:54:14.000000000 +0100
---- ffgtk-0.7.8.patched/ffgtk/Makefile.am	2010-12-23 00:09:23.000000000 +0100
-***************
-*** 2,10 ****
-  
-  ffgtkdir = $(datadir)/pixmaps/
-  ffgtk_DATA	= ../images/ffgtk.png
-  
-! ffgtk_CFLAGS = $(EXTRA_CFLAGS) -DSHAREDIR=\"$(pkgdatadir)/\" -DLIBDIR=\"$(libdir)/ffgtk/\" -DHTMLDIR=\"$(htmldir)/\" -DLIBEXECDIR=\"$(libexecdir)/ffgtk/\" -rdynamic -Wall -Werror -D_GNU_SOURCE -DLOCALE_DIR=\"$(datadir)/locale/\" -g
-  ffgtk_LDFLAGS = $(EXTRA_LIBS) -export-dynamic
-  
-  ffgtk_SOURCES =\
-  	about.c\
---- 2,10 ----
-  
-  ffgtkdir = $(datadir)/pixmaps/
-  ffgtk_DATA	= ../images/ffgtk.png
-  
-! ffgtk_CFLAGS = $(EXTRA_CFLAGS) -DSHAREDIR=\"$(pkgdatadir)/\" -DLIBDIR=\"$(libdir)/ffgtk/\" -DHTMLDIR=\"$(htmldir)/\" -DLIBEXECDIR=\"$(libexecdir)/\" -rdynamic -Wall -Werror -D_GNU_SOURCE -DLOCALE_DIR=\"$(datadir)/locale/\" -g -DUSE_OLD_SPOOLER
-  ffgtk_LDFLAGS = $(EXTRA_LIBS) -export-dynamic
-  
-  ffgtk_SOURCES =\
-  	about.c\
diff --git a/ffgtk.spec b/ffgtk.spec
index 9ea33e6..933e30f 100644
--- a/ffgtk.spec
+++ b/ffgtk.spec
@@ -1,6 +1,6 @@
 Name:           ffgtk
-Version:        0.7.8
-Release:        4%{?dist}
+Version:        0.7.94
+Release:        1%{?dist}
 Summary:        A solution for controlling Fritz!Box or compatible routers
 Group:          Applications/Communications
 License:        GPLv2
@@ -8,18 +8,16 @@ URL:            http://www.tabos.org/ffgtk/
 Source0:        http://www.tabos.org/ffgtk/download/%{name}-%{version}.tar.bz2
 Source1:        ffgtk-fax.ppd
 Source2:        ffgtk-README.Fedora
-source3:        ffgtk-license.txt
-Patch0:         ffgtk-libexec.patch
-Patch1:         ffgtk-use-old-spooler.patch
-Patch2:         ffgtk-no-Werror.patch
+Patch0:         ffgtk-use-old-spooler.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext autoconf automake libtool intltool desktop-file-utils
 BuildRequires:  gtk2-devel gstreamer-devel gstreamer-plugins-base-devel 
-BuildRequires:  libcurl-devel dbus-devel dbus-glib-devel libcapifax-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 libao-devel
+Buildrequires:  gnome-keyring-devel speex-devel libsndfile-devel  
+Buildrequires:  pulseaudio-libs-devel
 Provides:       bundled(md5-deutsch)
 
 %description
@@ -44,7 +42,7 @@ Requires(post): /usr/sbin/lpadmin
 Requires(postun):/usr/sbin/lpadmin
 
 %description  plugin-capifax
-This package contains the fax plugin for ffgtk.
+No longer needed. Package is left around to ease migration.
 
 %package plugin-gstreamer
 Summary:        Gstreamer plugin for ffgtk
@@ -55,15 +53,13 @@ This package contains the gstreamer plugin for ffgtk.
 
 %prep
 %setup -q
-%patch0 -p1 -b .libexec
-%patch1 -p1 -b .spooler
-%patch2 -p1 -b .noWerror
+%patch0 -p1 -b .spooler
 install -m644 %{SOURCE2} ./README.Fedora
-install -m644 %{SOURCE3} ./license-mail.txt
 
 %build
 ./autogen.sh
-%configure --htmldir=%{_datarootdir}/ffgtk/html
+# work around for broken spandsp pkconfig file
+%configure --with-spandsp=/usr
 make %{?_smp_mflags} 
 
 %install
@@ -87,8 +83,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/ffgtk.desktop
 find %{buildroot} -name '*.so' -exec rm -f {} ';'
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-%post plugin-capifax
-
+%post
 # On first install : create the printer if cupsd is running
 if [ "$1" -eq "1" -a -f "%{_var}/run/cupsd.pid" ]
 then
@@ -99,7 +94,7 @@ then
 fi
 
 
-%postun plugin-capifax
+%postun
 # on removal, remove the printer if cupsd is running
 if [ "$1" -eq "0" -a -f "%{_var}/run/cupsd.pid" ]
 then
@@ -116,16 +111,17 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%{_bindir}/ffgtk
 %dir %{_datarootdir}/ffgtk
-%dir %{_datarootdir}/ffgtk/html
-%dir %{_datarootdir}/ffgtk/html/graphics
 %dir %{_datarootdir}/ffgtk/areacodes_germany.csv
 %dir %{_libdir}/ffgtk
 %dir %{_libdir}/ffgtk/plugins
-%{_bindir}/ffgtk
-%{_libexecdir}/ffgtkvoxplay
 %{_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
@@ -134,8 +130,8 @@ rm -rf %{buildroot}
 %{_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_ao.so.0
-%{_libdir}/ffgtk/plugins/lib_audio_ao.so.0.0.0
+%{_libdir}/ffgtk/plugins/lib_audio_pulse.so.0
+%{_libdir}/ffgtk/plugins/lib_audio_pulse.so.0.0.0
 %{_datarootdir}/applications/ffgtk.desktop
 %{_datarootdir}/ffgtk/actions.ui
 %{_datarootdir}/ffgtk/addaddress.ui
@@ -150,7 +146,6 @@ rm -rf %{buildroot}
 %{_datarootdir}/ffgtk/callout.png
 %{_datarootdir}/ffgtk/dialing.ui
 %{_datarootdir}/ffgtk/dialwindow.ui
-%{_datarootdir}/ffgtk/ffgtk.png
 %{_datarootdir}/ffgtk/kind.ui
 %{_datarootdir}/ffgtk/lookup.xml
 %{_datarootdir}/ffgtk/popup.ui
@@ -158,11 +153,15 @@ rm -rf %{buildroot}
 %{_datarootdir}/ffgtk/profiles.ui
 %{_datarootdir}/ffgtk/sendfax.ui
 %{_datarootdir}/ffgtk/voicebox.ui
-%{_datarootdir}/ffgtk/html/*.html
-%{_datarootdir}/ffgtk/html/graphics/*
+%{_datarootdir}/ffgtk/notification-message-ffgtk-in.svg
+%{_datarootdir}/ffgtk/notification-message-ffgtk-out.svg
+%{_datarootdir}/icons/hicolor/scalable/apps/ffgtk.svg
+%{_datarootdir}/icons/ubuntu-mono-dark/scalable/apps/ffgtk.svg
+%{_datarootdir}/icons/ubuntu-mono-light/scalable/apps/ffgtk.svg
 %{_datarootdir}/pixmaps/ffgtk.png
 %{_mandir}/man1/ffgtk.1.gz
-%doc README AUTHORS ChangeLog COPYING README.Fedora license-mail.txt
+%{_datadir}/cups/model/ffgtk-fax.ppd
+%doc README AUTHORS ChangeLog COPYING README.Fedora 
 
 %files plugin-evolution 
 %defattr(-,root,root,-)
@@ -170,10 +169,6 @@ rm -rf %{buildroot}
 %{_libdir}/ffgtk/plugins/lib_ab_ebook.so.0.0.0
 
 %files plugin-capifax
-%defattr(-,root,root,-)
-%{_libdir}/ffgtk/plugins/lib_fax_capifax.so.0
-%{_libdir}/ffgtk/plugins/lib_fax_capifax.so.0.0.0
-%{_datadir}/cups/model/ffgtk-fax.ppd
 
 %files plugin-gstreamer
 %defattr(-,root,root,-)
@@ -181,29 +176,44 @@ rm -rf %{buildroot}
 %{_libdir}/ffgtk/plugins/lib_audio_gstreamer.so.0.0.0
 
 %changelog
+* Mon Jun 13 2011  Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.94-1
+- new upstream release
+- Voxbox support removes the need for libcapifax
+- plugin-capifax package removed
+- Fax  printing support moved to main package (capifax plugin will be
+  removed in a later release
+- removed -Werror patch as it is no longer required
+- removed libexec patch as there is no longer an external command
+
 * Thu Feb 10 2011 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.8-4
 - Remove -Werror from Makefile,am for now as it breaks compilation under RwaHide
   as -Wunused-but-set-parameter seems to be standard now
+
 * Fri Jan 28 2011 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.8-3
 - Added scriptlet dependencies
 - Removed duplicate documentation from plugin packages
 - Added Provides for bundled MD5 implementation
 - Check if cups is running before trying to remove the printer
+
 * Fri Dec 24 2010 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.8-2
 - Re-instated old print-spooler
 - Added a ppd for the fax printer
 - Automatically create/delete the required printer in cups
 - Added REAME.Fedora
+
 * Sat Nov 27 2010 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.8-1
 - New upstream release
+
 * Thu Jul 29 2010 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.7-1
 - New upstream release 0.7.7
 - new plugins
 - removed Fedora 13 patches: upstreamed
+
 * Sat May 25 2010 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.6-2
 - fixed DSO linking on Fedora 13
 - Fixed crash on Fedora 13
 - Added includes required for Fedora 13
+
 * Thu May 20 2010 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.6-1
 - Update to version 0.7.6
 * Thu May 20 2010 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.5-2
diff --git a/sources b/sources
index b5659a9..8893e72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e23de494510a96f515fdfe7e20292c59  ffgtk-0.7.8.tar.bz2
+1b8776178debb14e1c228caeeabd1dde  ffgtk-0.7.94.tar.bz2

More information about the scm-commits mailing list