Skip to content

Commit

Permalink
[packaging] based on tag telepathy-gabble-0.17.3-2-gac6b926
Browse files Browse the repository at this point in the history
  • Loading branch information
Islam Amer committed May 21, 2013
1 parent cdf4050 commit 3d397f4
Show file tree
Hide file tree
Showing 8 changed files with 371 additions and 1 deletion.
23 changes: 23 additions & 0 deletions rpm/0001-Disable-parallel-build-for-extensions-directory.patch
@@ -0,0 +1,23 @@
From a77cd07acfb145465e396c835090fe00bf713afe Mon Sep 17 00:00:00 2001
From: John Brooks <john.brooks@dereferenced.net>
Date: Mon, 29 Apr 2013 02:28:50 -0600
Subject: [PATCH] Disable parallel build for extensions directory

---
extensions/Makefile.am | 3 +++
1 file changed, 3 insertions(+)

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index ecb02ef..fbd30e7 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -93,3 +93,6 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
-:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
-:LDFLAGS $(libgabble_extensions_la_LIBADD) \
> $@
+
+.NOTPARALLEL:
+
--
1.7.9.5

2 changes: 2 additions & 0 deletions rpm/INSIGNIFICANT
@@ -0,0 +1,2 @@
jingle-share/test-send-file-send-before-accept.py - this often runs into a time out (https://bugs.freedesktop.org/show_bug.cgi?id=49595)
client-types.py - this fails from time to time (https://bugs.freedesktop.org/show_bug.cgi?id=37381)
55 changes: 55 additions & 0 deletions rpm/mktests.sh
@@ -0,0 +1,55 @@
#!/bin/sh

cat <<EOF
<?xml version="1.0" encoding="UTF-8"?>
<testdefinition version="1.0">
<suite name="telepathy-gabble-tests">
<description>Telepathy Gabble tests</description>
<set name="telepathy-gabble-C-tests">
EOF

for testcase in $(cat tests/gabble-C-tests.list)
do
testcase_name=$(echo $testcase|sed 's/\//_/')
attributes="name=\"$testcase_name\""
insignificant=`grep "^$testcase" tests/INSIGNIFICANT || true`
if test -n "$insignificant"
then
continue
attributes="$attributes insignificant=\"true\""
fi
cat <<EOF
<case $attributes>
<step>/opt/tests/telepathy-gabble/$testcase</step>
</case>
EOF
done

cat <<EOF
</set>
<set name="telepathy-gabble-twisted-tests">
EOF

for testcase in $(cat tests/twisted/gabble-twisted-tests.list)
do
testcase_name=$(echo $testcase|sed 's/\//_/')
attributes="name=\"$testcase_name\""
insignificant=`grep "^$testcase" tests/INSIGNIFICANT || true`
if test -n "$insignificant"
then
continue
attributes="$attributes insignificant=\"true\""
fi
cat <<EOF
<case $attributes>
<step>/opt/tests/telepathy-gabble/twisted/run-test.sh $testcase</step>
</case>
EOF
done

cat <<EOF
</set>
</suite>
</testdefinition>
EOF

12 changes: 12 additions & 0 deletions rpm/nemo-tests-dir-fix.patch
@@ -0,0 +1,12 @@
diff -Naur telepathy-gabble-0.17.1/configure.ac telepathy-gabble-0.17.1-tests/configure.ac
--- telepathy-gabble-0.17.1/configure.ac 2012-09-11 13:51:59.000000000 +0000
+++ telepathy-gabble-0.17.1-tests/configure.ac 2013-04-08 07:26:00.009864418 +0000
@@ -184,7 +184,7 @@
fi
AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], [test "x$installed_tests" = xyes])

-gabbletestsdir=${libdir}/telepathy-gabble-tests
+gabbletestsdir=/opt/tests/telepathy-gabble
AC_SUBST(gabbletestsdir)

AC_ARG_ENABLE([is-a-phone],
89 changes: 89 additions & 0 deletions rpm/telepathy-gabble.changes
@@ -0,0 +1,89 @@
* Sun Apr 28 2013 John Brooks <john.brooks@jollamobile.com> - 0.17.3
- Update to 0.17.3
- Add 0.17.3-fix-fdo-61792.patch adapted from master to fix a build failure
- Add 0001-Disable-parallel-build-for-extensions-directory.patch to fix occasional build failures

* Tue Apr 8 2013 Reto Zingg <reto.zingg@jollamobile.com> - 0.17.1
- add -tests package for automated testing

* Thu Oct 04 2012 Marko Saukko <marko.saukko@jollamobile.com> - 0.17.1
- Update to 0.17.1, require telepathy-filesystem and telepathy-mission-control

* Mon Aug 06 2012 Marko Saukko <marko.saukko@jollamobile.com> - 0.16.1
- Update to version 0.16.1

* Wed May 09 2012 Maurice de la Ferté <Maurice.Ferte@basyskom.com> - 0.15.1
- Add needed BuildRequires and remove configure option to get a connection to
e.g. a jabber server established. This prevents for following error:
(dbus-monitor output): "WOCKY_TLS_CERT_SIGNER_UNKNOWN ..."

* Thu Dec 01 2011 Marko Saukko <marko.saukko@cybercom.com> - 0.15.1
- Updated to version 0.15.1

* Fri Jul 29 2011 Zheng Wu <wu.zheng@intel.com> - 0.13.3
- Update to upstream 0.13.3 (BMC#22073)

* Thu Jun 16 2011 Gustavo Pichorim Boiko <gustavo.boiko@collabora.co.uk> - 0.12.2
- Update to 0.12.2 to fix GTalk calls (BMC#19026)

* Tue Apr 26 2011 Alban Crequy <alban.crequy@collabora.co.uk> - 0.12.0
- Update to upstream 0.12.0 for BMC#9615
- Remove patch from the .yaml file. It was already removed from the .spec
since 0.11.6 for BMC#13306 but yaml and spec were out of sync

* Tue Mar 22 2011 wu zheng <wu.zheng@intel.com> - 0.11.8
- Update to upstream 0.11.8

* Mon Mar 14 2011 Huaxu Wan <huaxu.wan@intel.com> - 0.11.7
- Update to upstream 0.11.7, Fix BMC#13872

* Tue Feb 08 2011 Siraj Razick <siraj.razick@collabora.co.uk> - 0.11.6
- Update to upstream 0.11.6 (BMC#13306)
- Removes the patch to build without CA certificates

* Thu Dec 2 2010 Senko Rasic <senko.rasic@collabora.co.uk> - 0.11.3
- Update to upstream 0.11.3 (BMC#10827)
- Remove mail status polling patch, included in upstream
- Add patch fixing build when system cacert location is not provided

* Mon Nov 22 2010 Senko Rasic <senko.rasic@collabora.co.uk> - 0.10.4
- Update to upstream 0.10.4 (BMC#10300)
+ Add HTTP proxy support
+ Make Wocky more tolerant/graceful in error conditions
+ Invisibility support
- Remove dependancy on loudmouth since it's not used anymore
- Requires telepathy-glib 0.11.16 or newer

* Mon Nov 08 2010 Rob Bradford <rob@linux.intel.com> - 0.9.15
- Include patch to workaround server mail notification issues (BMC#8980)

* Thu Jul 29 2010 Huaxu Wan <huaxu.wan@linux.intel.com> - 0.9.15
- Update to 0.9.15

* Tue Mar 16 2010 Rob Bradford <rob@linux.intel.com> - 0.9.7
- Update to latest release (needed for Myzone IM mail notification)

* Mon Feb 22 2010 Anas Nashif <anas.nashif@intel.com> - 0.8.8
- Update with spectacle

* Wed Dec 02 2009 Jian-feng Ding <jian-feng.ding@intel.com> 0.8.8
- Upgrade to latest, several bugs fixed

* Sun Oct 11 2009 Rob Bradford <rob@linux.intel.com> 0.8.6
- Update to fix crashers

* Wed Sep 30 2009 Rob Bradford <rob@linux.intel.com> 0.8.3
- Update to 0.8.3 to fix MC5/tp-glib issues

* Wed Aug 26 2009 Jian-feng Ding <jian-feng.ding@intel.com> 0.8.1
- Upgrade to 0.8.1, dropped unused patch

* Sat May 23 2009 Arjan van de Ven <arjan@linux.intel.com> 0.7.24
- Fix build with as-needed

* Thu Apr 02 2009 Ding Jian-feng <jian-feng.ding@intel.com> 0.7.24
- Upgrade to 0.7.24

* Tue Feb 10 2009 Damien Lespiau <damien.lespiau@intel.com> 0.7.20
- Initial import into moblin

137 changes: 137 additions & 0 deletions rpm/telepathy-gabble.spec
@@ -0,0 +1,137 @@
#
# Do NOT Edit the Auto-generated Part!
# Generated by: spectacle version 0.26
#

Name: telepathy-gabble

# >> macros
# << macros

Summary: A Jabber/XMPP connection manager
Version: 0.17.3
Release: 1
Group: Applications/Communications
License: LGPLv2+ and BSD
URL: http://telepathy.freedesktop.org/wiki/
Source0: http://telepathy.freedesktop.org/releases/telepathy-gabble/%{name}-%{version}.tar.gz
Source1: INSIGNIFICANT
Source2: mktests.sh
Patch0: nemo-tests-dir-fix.patch
Patch1: 0001-Disable-parallel-build-for-extensions-directory.patch
Patch2: wocky-disable-gtkdoc.patch
Requires: telepathy-mission-control
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(dbus-1) >= 1.1.0
BuildRequires: pkgconfig(nice) >= 0.0.11
BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(dbus-glib-1) >= 0.82
BuildRequires: pkgconfig(telepathy-glib) >= 0.19.7
BuildRequires: pkgconfig(glib-2.0) >= 2.30
BuildRequires: pkgconfig(gobject-2.0) >= 2.30
BuildRequires: pkgconfig(gthread-2.0) >= 2.30
BuildRequires: pkgconfig(gio-2.0) >= 2.30
BuildRequires: pkgconfig(gmodule-2.0) >= 2.30
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libidn)
BuildRequires: pkgconfig(gnutls)
BuildRequires: python
BuildRequires: ca-certificates
BuildRequires: python-twisted
BuildRequires: dbus-python

%description
A Jabber/XMPP connection manager, that handles single and multi-user
chats and voice calls.


%package tests
Summary: Tests package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: python-twisted
Requires: pyOpenSSL
Requires: dbus-python

%description tests
The %{name}-tests package contains tests and
tests.xml for automated testing.


%prep
%setup -q -n %{name}-%{version}/%{name}

# nemo-tests-dir-fix.patch
%patch0 -p1
# 0001-Disable-parallel-build-for-extensions-directory.patch
%patch1 -p1
cd lib/ext/wocky
%patch2 -p1
cd ../../..

# >> setup
%__cp $RPM_SOURCE_DIR/mktests.sh tests/
%__cp $RPM_SOURCE_DIR/INSIGNIFICANT tests/
%__chmod 0755 tests/mktests.sh
%__chmod 0644 tests/INSIGNIFICANT
# << setup

%build
# >> build pre
cd lib/ext/wocky
%autogen --no-configure --disable-gtk-doc
cd ../../..
%autogen --disable-submodules --no-configure
# << build pre

%reconfigure --disable-static \
--enable-installed-tests

make %{?jobs:-j%jobs}

# >> build post
tests/mktests.sh > tests/tests.xml
# << build post

%install
rm -rf %{buildroot}
# >> install pre
# << install pre
%make_install

# >> install post
install -m 0644 tests/tests.xml $RPM_BUILD_ROOT/opt/tests/telepathy-gabble/tests.xml
install -m 0644 tests/INSIGNIFICANT $RPM_BUILD_ROOT/opt/tests/telepathy-gabble/INSIGNIFICANT
install -m 0644 tests/README $RPM_BUILD_ROOT/opt/tests/telepathy-gabble/README
# << install post

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
# >> files
%doc COPYING AUTHORS
%doc %{_datadir}/doc/%{name}/*.html
%{_libexecdir}/%{name}
%{_bindir}/telepathy-gabble-xmpp-console
%{_libdir}/telepathy/gabble-0/lib/libgabble-plugins-*.so
%{_libdir}/telepathy/gabble-0/lib/libgabble-plugins.so
%{_libdir}/telepathy/gabble-0/lib/libwocky-telepathy-gabble-*.so
%{_libdir}/telepathy/gabble-0/lib/libwocky.so
%{_libdir}/telepathy/gabble-0/plugins/libconsole.so
%{_libdir}/telepathy/gabble-0/plugins/libgateways.so
%{_datadir}/dbus-1/services/*.service
%{_datadir}/telepathy/managers/*.manager
%{_mandir}/man8/%{name}.8.gz
# << files

%files tests
%defattr(-,root,root,-)
/opt/tests/%{name}/*
# >> files tests
# << files tests
52 changes: 52 additions & 0 deletions rpm/wocky-disable-gtkdoc.patch
@@ -0,0 +1,52 @@
diff --git a/autogen.sh b/autogen.sh
index 0d8e27d..e9459e3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,27 @@
#!/bin/sh
set -e

-gtkdocize || exit 1
+# check if gtk-doc is explicitly disabled
+for ag_option in $@
+do
+ case $ag_option in
+ -disable-gtk-doc | --disable-gtk-doc)
+ enable_gtk_doc=no
+ ;;
+ esac
+done
+
+if test x$enable_gtk_doc = xno; then
+ if test -f gtk-doc.make; then :; else
+ echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make
+ fi
+ echo "WARNING: You have disabled gtk-doc."
+ echo " As a result, you will not be able to generate the API"
+ echo " documentation and 'make dist' will not work."
+ echo
+else
+ gtkdocize || exit $?
+fi

if test -n "$AUTOMAKE"; then
: # don't override an explicit user request
diff --git a/configure.ac b/configure.ac
index 75c1c48..f89952e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -286,7 +286,13 @@ dnl To be used by tests and examples
WOCKY_CFLAGS='-I${top_builddir} -I${top_srcdir}'
AC_SUBST(WOCKY_CFLAGS)

-GTK_DOC_CHECK([1.17],[--flavour no-tmpl])
+AM_CONDITIONAL(ENABLE_GTK_DOC, test "x$enable_gtk_doc" = xyes)
+AM_CONDITIONAL(DISABLE_GTK_DOC, test "x$disable_gtk_doc" = xno)
+# Check for GTK_DOC_CHECK availability. The GTK_DOC_CHECK invocation
+# must be on its own line, gtkdocize relies on it
+m4_ifdef([GTK_DOC_CHECK], [
+ GTK_DOC_CHECK([1.17],[--flavour no-tmpl])
+])

AC_OUTPUT( Makefile \
wocky/Makefile \
2 changes: 1 addition & 1 deletion telepathy-gabble
Submodule telepathy-gabble updated from 315728 to ac6b92

0 comments on commit 3d397f4

Please sign in to comment.