From 734bc33aeec7c9e59ac1e779cc1501e1786e8665 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Wed, 25 Feb 2009 18:26:24 -0500
Subject: [PATCH] Update spec files
---
autogen.sh | 2 +-
configure.ac | 15 ++-
platform/fedora.spec | 18 ++-
.../sflphone-fc9.spec => fedora.spec.in} | 45 +++++---
platform/fedora/sflphone-fc6.spec.in | 52 ---------
platform/fedora/sflphone.spec.in | 49 ---------
platform/fedora/sflphoned.spec.in | 48 --------
platform/suse.spec | 17 ++-
platform/suse.spec.in | 104 ++++++++++++++++++
9 files changed, 174 insertions(+), 176 deletions(-)
rename platform/{fedora/sflphone-fc9.spec => fedora.spec.in} (65%)
delete mode 100644 platform/fedora/sflphone-fc6.spec.in
delete mode 100644 platform/fedora/sflphone.spec.in
delete mode 100644 platform/fedora/sflphoned.spec.in
create mode 100644 platform/suse.spec.in
diff --git a/autogen.sh b/autogen.sh
index ac85bd137c..06b6a97c95 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,6 +4,6 @@
aclocal -I m4
libtoolize --force
autoheader
-autoconf -v -f
+autoconf -f
automake -a
./configure $@
diff --git a/configure.ac b/configure.ac
index 9a3b2af982..b3a168ba65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([SFLPhone],[0.9.3],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([SFLphone],[0.9.3],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
AC_REVISION([$Revision$])
@@ -53,30 +53,29 @@ AC_CONFIG_FILES([man/Makefile])
AC_CONFIG_FILES([doc/Makefile \
doc/doxygen/Makefile])
-AC_CONFIG_FILES([platform/rpm/sflphone.spec \
- platform/fedora/sflphone.spec \
- platform/fedora/sflphone-fc6.spec])
+AC_CONFIG_FILES([platform/suse.spec \
+ platform/fedora.spec])
dnl the file stamp-h.in should be there before (instead of AC_CONFIG_HEADERS(config.h))
dnl AM_CONFIG_HEADER(config.h)
dnl Get project version
-VERSION=`sed -ne 's/^#define SFLPHONED_VERSION "\(.*\)"/\1/p' ${srcdir}/src/global.h`
+VERSION=`sed -ne 's/^#define SFLPHONED_VERSION "\(.*\)"/\1/p' src/global.h`
dnl Get rid of release number
RPM_VERSION=`echo $VERSION | cut -d- -f1`
AC_SUBST(RPM_VERSION)
RPM_RELEASE=`echo $VERSION | sed -ne 's/.*-\(.*\)/\1/p' `
AC_SUBST(RPM_RELEASE)
-VERSION=`echo $VERSION | cut -d- -f1`
+VERSION=`echo $VERSION | cut -f1 -d\' \'`
AC_SUBST(VERSION)
dnl Settings need Standard C++ Library
LIBS="$LIBS -lstdc++"
dnl Solaris pkgadd support definitions
-PKGADD_PKG="SFLPhone"
-PKGADD_NAME="SFLPhone - a SIP client and daemon"
+PKGADD_PKG="SFLphone"
+PKGADD_NAME="SFLphone - a SIP client and daemon"
PKGADD_VENDOR="http://www.sflphone.org/"
AC_SUBST(PKGADD_PKG)
AC_SUBST(PKGADD_NAME)
diff --git a/platform/fedora.spec b/platform/fedora.spec
index b5c5444b58..65e07034a5 100644
--- a/platform/fedora.spec
+++ b/platform/fedora.spec
@@ -1,5 +1,5 @@
%define name sflphone
-%define version 0.9.3
+%define version
Autoreq: 0
Name: %name
@@ -13,7 +13,7 @@ Packager: Emmanuel Milou <emmanuel.milouu@savoirfairelinux.com>
Source0: %{name}-%{version}.tar.gz
Source1: libpj-sfl.pc
BuildRoot: %{_tmppath}/%{name}-%{version}
-Requires: commoncpp2 ccrtp cppunit libsamplerate pulseaudio-libs-zeroconf pulseaudio-libs-devel gsm speex sflphone-iax2 dbus-c++ libgcc dbus-glib expat gtk2 glibc glib2 dbus-libs dbus-glib libsexy libnotify perl
+Requires: commoncpp2 ccrtp cppunit libsamplerate pulseaudio-libs-zeroconf pulseaudio-libs-devel gsm speex libgcc dbus-glib expat gtk2 glibc glib2 dbus-libs dbus-glib libsexy libnotify perl
%description
SFLphoned is a VoIP daeamon with SIP protocol and IAX protocol.
@@ -25,6 +25,13 @@ cd libs/pjproject-1.0.1
make dep
make clean
make
+cd ../dbus-c++
+./configure --prefix=/usr
+make
+cd ../libiax2
+./gen.sh
+./configure --prefix=/usr
+make
cd ../..
%build
@@ -43,6 +50,13 @@ cd sflphone-gtk/
cd ../libs/pjproject-1.0.1
%makeinstall
+
+cd ../dbus-c++
+%makeinstall
+
+cd ../libiax2
+%makeinstall
+
cd ../..
cd %{buildroot}/usr/bin/
ln -sf ./sflphone-gtk sflphone
diff --git a/platform/fedora/sflphone-fc9.spec b/platform/fedora.spec.in
similarity index 65%
rename from platform/fedora/sflphone-fc9.spec
rename to platform/fedora.spec.in
index e7d8a1e210..6267600c78 100644
--- a/platform/fedora/sflphone-fc9.spec
+++ b/platform/fedora.spec.in
@@ -1,39 +1,44 @@
%define name sflphone
-%define version 0.9.2
+%define version @VERSION@
Autoreq: 0
Name: %name
Summary: A VoIP daemon with SIP protocol and IAX protocol
Version: %version
-Release: 2
+Release: 2fedora
License: GPL
Group: System Environment/Daemons
URL: http://www.sflphone.org/
-Packager: Yun Liu <yun.liu@savoirfairelinux.com>
+Packager: Emmanuel Milou <emmanuel.milouu@savoirfairelinux.com>
Source0: %{name}-%{version}.tar.gz
Source1: libpj-sfl.pc
BuildRoot: %{_tmppath}/%{name}-%{version}
-Requires: commoncpp2 ccrtp cppunit libsamplerate pulseaudio-libs-zeroconf pulseaudio-libs-devel gsm speex sflphone-iax2 dbus-c++ libgcc dbus-glib expat gtk2 glibc glib2 dbus-libs dbus-glib libsexy libnotify perl
+Requires: commoncpp2 ccrtp cppunit libsamplerate pulseaudio-libs-zeroconf pulseaudio-libs-devel gsm speex libgcc dbus-glib expat gtk2 glibc glib2 dbus-libs dbus-glib libsexy libnotify perl
%description
-SFLPhoned is a VoIP daeamon with SIP protocol and IAX protocol.
+SFLphoned is a VoIP daeamon with SIP protocol and IAX protocol.
%prep
%setup -q
-cd libs/pjproject-1.0
+cd libs/pjproject-1.0.1
./configure --prefix=/usr
make dep
make clean
make
+cd ../dbus-c++
+./configure --prefix=/usr
+make
+cd ../libiax2
+./gen.sh
+./configure --prefix=/usr
+make
cd ../..
%build
-./autogen.sh
-./configure --prefix=/usr
+./autogen.sh --prefix=/usr
make
cd sflphone-gtk/
-./autogen.sh
-./configure --prefix=/usr
+./autogen.sh --prefix=/usr
make
cd ..
@@ -43,21 +48,27 @@ cd ..
cd sflphone-gtk/
%makeinstall
-cd ../libs/pjproject-1.0
+cd ../libs/pjproject-1.0.1
%makeinstall
+
+cd ../dbus-c++
+%makeinstall
+
+cd ../libiax2
+%makeinstall
+
cd ../..
cd %{buildroot}/usr/bin/
ln -sf ./sflphone-gtk sflphone
cd -
cp %{SOURCE1} %{buildroot}/usr/lib/pkgconfig/ -f
-rm -f %{buildroot}/usr/include/Makefile.*
-rm -rf %{buildroot}/usr/lib/debug
+rm -rf %{buildroot}/usr/lib/debug
+rm -rf %{buildroot}/usr/include/
%files
%defattr(-, root, root)
/usr/bin/*
-/usr/include/*
/usr/lib/*
/usr/share/applications/*
/usr/share/dbus-1/services/*
@@ -72,6 +83,12 @@ rm -rf %{buildroot}
%changelog
+* Mon Feb 16 2009 Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> 2fedora
+ - Packaging 0.9.3-2 sflphone version on Fedora 10
+
+* Mon Jan 26 2009 Yun Liu <yun.liu@savoirfairelinux.com> 6
+ - Packaging sflphone for Fedora 10
+
* Mon Jan 5 2009 Yun Liu <yun.liu@savoirfairelinux.com>
- Fix bug ticket #107, #108, #109, #110, #111, #117, #129
diff --git a/platform/fedora/sflphone-fc6.spec.in b/platform/fedora/sflphone-fc6.spec.in
deleted file mode 100644
index 03640ada06..0000000000
--- a/platform/fedora/sflphone-fc6.spec.in
+++ /dev/null
@@ -1,52 +0,0 @@
-%define name sflphone
-%define version @RPM_VERSION@
-Autoreq: 0
-
-Name: %name
-Summary: A VoIP daemon with SIP protocol
-Version: %version
-Release: 1
-License: GPL
-Group: System Environment/Daemons
-URL: http://www.sflphone.org/
-Packager: Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>
-Source0: http://www.sflphone.org/releases/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: commoncpp2 ccrtp libosip2 libeXosip2 libsamplerate qt
-
-%description
-SFLPhoned is a VoIP daeamon with SIP protocol.
-%prep
-%setup -q
-
-%build
-%configure --prefix=%{_prefix}
-make
-
-%install
-rm -fr %{buildroot}
-
-%makeinstall
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-, root, root)
-%{_bindir}/sflphone
-%{_libexecdir}/sflphoned
-%{_libexecdir}/sflphone-qt
-%{_libexecdir}/sflphone-cli
-%{_datadir}/sflphone/ringtones/*
-%{_datadir}/sflphone/skins/*
-
-%changelog
-* Thu Nov 30 2006 Yan Morin <yan.morin@savoirfairelinux.com>
- Packaging sflphone for Fedora Core 6
-
-* Wed Sep 6 2006 Yan Morin <yan.morin@savoirfairelinux.com>
- Packaging sflphone, sflphone-qt and sflphone-cli
-
-* Mon Nov 21 2005 Yan Morin <yan.morin@savoirfairelinux.com>
-- Final 0.6.0 version (Release / Source without alphatag)
-
diff --git a/platform/fedora/sflphone.spec.in b/platform/fedora/sflphone.spec.in
deleted file mode 100644
index 08746b9cde..0000000000
--- a/platform/fedora/sflphone.spec.in
+++ /dev/null
@@ -1,49 +0,0 @@
-%define name sflphone
-%define version @RPM_VERSION@
-Autoreq: 0
-
-Name: %name
-Summary: A VoIP daemon with SIP protocol
-Version: %version
-Release: 1
-License: GPL
-Group: System Environment/Daemons
-URL: http://www.sflphone.org/
-Packager: Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>
-Source0: http://www.sflphone.org/releases/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: commoncpp2 ccrtp libosip2 libexosip2 samplerate qt
-
-%description
-SFLPhoned is a VoIP daeamon with SIP protocol.
-%prep
-%setup -q
-
-%build
-%configure --prefix=%{_prefix}
-make
-
-%install
-rm -fr %{buildroot}
-
-%makeinstall
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-, root, root)
-%{_bindir}/sflphone
-%{_libexecdir}/sflphoned
-%{_libexecdir}/sflphone-qt
-%{_libexecdir}/sflphone-cli
-%{_datadir}/sflphone/ringtones/*
-%{_datadir}/sflphone/skins/*
-
-%changelog
-* Wed Sep 6 2006 Yan Morin <yan.morin@savoirfairelinux.com>
- Packaging sflphone, sflphone-qt and sflphone-cli
-
-* Mon Nov 21 2005 Yan Morin <yan.morin@savoirfairelinux.com>
-- Final 0.6.0 version (Release / Source without alphatag)
-
diff --git a/platform/fedora/sflphoned.spec.in b/platform/fedora/sflphoned.spec.in
deleted file mode 100644
index 4066ea8694..0000000000
--- a/platform/fedora/sflphoned.spec.in
+++ /dev/null
@@ -1,48 +0,0 @@
-%define name sflphoned
-%define version @RPM_VERSION@
-%define alphatag @RPM_RELEASE@
-Autoreq: 0
-
-Name: %name
-Summary: A VoIP daemon with SIP protocol
-Version: %version
-Release: 1
-#Release: 0.1.%{alphatag}
-License: GPL
-Group: System Environment/Daemons
-URL: http://www.sflphone.org/
-Packager: Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>
-#Source0: http://www.sflphone.org/releases/%{name}-%{version}-%{alphatag}.tar.gz
-Source0: http://www.sflphone.org/releases/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: commoncpp2 ccrtp libosip2
-BuildRequires: autoconf
-BuildRequires: automake
-
-%description
-SFLPhoned is a VoIP daeamon with SIP protocol.
-%prep
-%setup -q
-
-%build
-%configure --disable-zeroconf --prefix=%{_prefix}
-make
-
-%install
-rm -fr %{buildroot}
-
-%makeinstall
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-, root, root)
-%{_bindir}/sflphone
-%{_libexecdir}/sflphoned
-%{_datadir}/sflphone/ringtones/*
-
-%changelog
-* Mon Nov 21 2005 Yan Morin <yan.morin@savoirfairelinux.com>
-- Final 0.6.0 version (Release / Source without alphatag)
-
diff --git a/platform/suse.spec b/platform/suse.spec
index b36800eb12..82a3412cce 100644
--- a/platform/suse.spec
+++ b/platform/suse.spec
@@ -1,5 +1,5 @@
%define name sflphone
-%define version 0.9.3
+%define version
Autoreq: 0
Name: %name
@@ -13,7 +13,7 @@ Packager: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Source0: %{name}-%{version}.tar.gz
Source1: libpj-sfl.pc
BuildRoot: %{_tmppath}/%{name}-%{version}
-Requires: commoncpp2 ccrtp cppunit libsamplerate pulseaudio-libs-zeroconf pulseaudio-libs-devel gsm speex sflphone-iax2 dbus-c++ libgcc dbus-glib expat gtk2 glibc glib2 dbus-libs dbus-glib libsexy libnotify perl
+Requires: commoncpp2 ccrtp cppunit libsamplerate pulseaudio-libs-zeroconf pulseaudio-libs-devel gsm speex libgcc dbus-glib expat gtk2 glibc glib2 dbus-libs dbus-glib libsexy libnotify perl
%description
SFLphoned is a VoIP daeamon with SIP protocol and IAX protocol.
@@ -25,6 +25,13 @@ cd libs/pjproject-1.0.1
make dep
make clean
make
+cd ../dbus-c++
+./configure --prefix=/usr
+make
+cd ../libiax2
+./gen.sh
+./configure --prefix=/usr
+make
cd ../..
%build
@@ -44,6 +51,12 @@ make prefix=%{buildroot}/usr install
cd ../libs/pjproject-1.0.1
make prefix=%{buildroot}/usr install
+cd ../dbus-c++
+make prefix=%{buildroot}/usr install
+
+cd ../libiax2
+make prefix=%{buildroot}/usr install
+
cd ../..
cd %{buildroot}/usr/bin/
ln -sf ./sflphone-gtk sflphone
diff --git a/platform/suse.spec.in b/platform/suse.spec.in
new file mode 100644
index 0000000000..74e1ae85ef
--- /dev/null
+++ b/platform/suse.spec.in
@@ -0,0 +1,104 @@
+%define name sflphone
+%define version @VERSION@
+Autoreq: 0
+
+Name: %name
+Summary: A VoIP daemon with SIP protocol and IAX protocol
+Version: %version
+Release: 2suse
+License: GPL
+Group: System Environment/Daemons
+URL: http://www.sflphone.org/
+Packager: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+Source0: %{name}-%{version}.tar.gz
+Source1: libpj-sfl.pc
+BuildRoot: %{_tmppath}/%{name}-%{version}
+Requires: commoncpp2 ccrtp cppunit libsamplerate pulseaudio-libs-zeroconf pulseaudio-libs-devel gsm speex libgcc dbus-glib expat gtk2 glibc glib2 dbus-libs dbus-glib libsexy libnotify perl
+
+%description
+SFLphoned is a VoIP daeamon with SIP protocol and IAX protocol.
+
+%prep
+%setup -q
+cd libs/pjproject-1.0.1
+./configure --prefix=/usr
+make dep
+make clean
+make
+cd ../dbus-c++
+./configure --prefix=/usr
+make
+cd ../libiax2
+./gen.sh
+./configure --prefix=/usr
+make
+cd ../..
+
+%build
+./autogen.sh --prefix=/usr
+make
+cd sflphone-gtk/
+./autogen.sh --prefix=/usr
+make
+cd ..
+
+%install
+make prefix=%{buildroot}/usr install
+
+cd sflphone-gtk/
+make prefix=%{buildroot}/usr install
+
+cd ../libs/pjproject-1.0.1
+make prefix=%{buildroot}/usr install
+
+cd ../dbus-c++
+make prefix=%{buildroot}/usr install
+
+cd ../libiax2
+make prefix=%{buildroot}/usr install
+
+cd ../..
+cd %{buildroot}/usr/bin/
+ln -sf ./sflphone-gtk sflphone
+cd -
+cp %{SOURCE1} %{buildroot}/usr/lib/pkgconfig/ -f
+
+rm -rf %{buildroot}/usr/lib/debug
+rm -rf %{buildroot}/usr/include
+
+%files
+%defattr(-, root, root)
+/usr/bin/*
+/usr/lib/*
+/usr/share/applications/*
+/usr/share/dbus-1/services/*
+/usr/share/locale/*
+/usr/share/pixmaps/*
+/usr/share/sflphone/*
+/usr/share/man/*
+
+%clean
+rm -rf %{buildroot}
+
+%changelog
+* Mon Feb 16 2009 Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> 2suse
+ - Packaging 0.9.3-2 sflphone version on openSUSE 11
+
+* Mon Jan 26 2009 Yun Liu <yun.liu@savoirfairelinux.com> 6suse
+ - Packaging sflphone on openSUSE 11
+
+* Mon Jan 5 2009 Yun Liu <yun.liu@savoirfairelinux.com>
+ - Fix bug ticket #107, #108, #109, #110, #111, #117, #129
+
+* Thu Nov 6 2008 Yun Liu <yun.liu@savoirfairelinux.com>
+ - Packaging sflphone for Fedora 9
+
+* Thu Nov 30 2006 Yan Morin <yan.morin@savoirfairelinux.com>
+ Packaging sflphone for Fedora Core 6
+
+* Wed Sep 6 2006 Yan Morin <yan.morin@savoirfairelinux.com>
+ Packaging sflphone, sflphone-qt and sflphone-cli
+
+* Mon Nov 21 2005 Yan Morin <yan.morin@savoirfairelinux.com>
+- Final 0.6.0 version (Release / Source without alphatag)
+
--
GitLab