rpms/bisho/devel bisho-disablecapplet.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 bisho.spec, 1.16, 1.17 sources, 1.9, 1.10

Sun Jul 11 12:18:37 UTC 2010

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25148

Modified Files:
	.cvsignore bisho.spec sources 
Added Files:
	bisho-disablecapplet.patch 
Log Message:
- New upstream 0.25.1 release

bisho-disablecapplet.patch:
 configure.ac    |   21 +++++++++++++++++----
 src/Makefile.am |    3 ++-
 2 files changed, 19 insertions(+), 5 deletions(-)

--- NEW FILE bisho-disablecapplet.patch ---
>From 02a459b755a42785926a370425f68d14d1fbc976 Mon Sep 17 00:00:00 2001
From: Rob Bradford <rob at linux.intel.com>
Date: Wed, 16 Jun 2010 15:42:52 +0100
Subject: [PATCH] build: Allow disabling the capplet compilation

---
 configure.ac    |   21 +++++++++++++++++----
 src/Makefile.am |    2 ++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 11c280c..8101cdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,13 +40,26 @@ PKG_CHECK_MODULES(DEPS, gmodule-export-2.0
                         unique-1.0
                         mx-gtk-1.0)
 
+AC_ARG_ENABLE([capplet],
+              [AC_HELP_STRING([--disable-capplet],
+                              [Disable the building of the capplet])],
+              [enable_cappled=$enableval],
+              [enable_capplet=yes])
+
+AM_CONDITIONAL([ENABLE_CAPPLET], [test "x$enable_capplet" = "xyes"])
+
+AS_IF([test "x$enable_capplet" = "xyes"],
+      [
+      PKG_CHECK_MODULES(CAPPLET,
+                        libgnome-control-center-extension)
+
+      EXTENSIONSDIR=$($PKG_CONFIG libgnome-control-center-extension --variable=extensiondir)
+      AC_SUBST(EXTENSIONSDIR)
+])
+
 MODULESDIR=$libdir/AC_PACKAGE_NAME
 AC_SUBST([MODULESDIR])
 
-PKG_CHECK_MODULES(CC, libgnome-control-center-extension)
-EXTENSIONSDIR=$($PKG_CONFIG libgnome-control-center-extension --variable=extensiondir)
-AC_SUBST(EXTENSIONSDIR)
-
 AM_GCONF_SOURCE_2
 
 AC_OUTPUT([
diff --git a/src/Makefile.am b/src/Makefile.am
index d1f2fca..6289f51 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,6 +30,7 @@ bin_PROGRAMS = bisho
 bisho_SOURCES = main.c
 bisho_LDADD = libbisho-common.la
 
+if ENABLE_CAPPLET
 ccmodulesdir = $(EXTENSIONSDIR)
 ccmodules_LTLIBRARIES = libbisho.la
 libbisho_la_SOURCES = \
@@ -38,3 +39,4 @@ libbisho_la_SOURCES = \
 libbisho_la_CPPFLAGS = $(AM_CPPFLAGS) $(CC_CFLAGS)
 libbisho_la_LIBADD = $(CC_LIBS) libbisho-common.la
 libbisho_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
+endif
-- 
1.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Feb 2010 16:46:12 -0000	1.9
+++ .cvsignore	11 Jul 2010 12:18:37 -0000	1.10
@@ -1 +1 @@
-bisho-0.20.0.tar.bz2
+bisho-0.25.1.tar.gz


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- bisho.spec	28 Feb 2010 16:46:12 -0000	1.16
+++ bisho.spec	11 Jul 2010 12:18:37 -0000	1.17
@@ -1,26 +1,34 @@
-Name:           bisho
-Version:        0.20.0
-Release:        1%{?dist}
-Summary:        Moblin configuration tool for mojito social network aggregator
-
-Group:          System Environment/Libraries
-License:        GPLv2+
-URL:            http://www.moblin.org/
-Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Tarfile created using git
+# git clone git://gitorious.org/meego-netbook-ux/bisho.git
+# git archive --format=tar --prefix=bisho-%{version}/ %{git_version} | bzip2 > %{name}-%{version}.tar.bz2
+%define git_version 211f893
+%define tarfile %{name}-%{version}.tar.gz
+
+Name:          bisho
+Version:       0.25.1
+Release:       1%{?dist}
+Summary:       MeeGo configuration tool for libsocialweb social network aggregator
+
+Group:         System Environment/Libraries
+License:       GPLv2+
+URL:           http://www.meego.com
+Source0:       %{tarfile}
+Patch0:        bisho-disablecapplet.patch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
 BuildRequires: gnome-keyring-devel
+BuildRequires: libmx-devel
 BuildRequires: libsoup-devel
-BuildRequires: mojito-devel
-BuildRequires: nbtk-devel
+BuildRequires: libsocialweb-devel
 BuildRequires: rest-devel
 BuildRequires: unique-devel
 BuildRequires: desktop-file-utils
+
+# Require these because the git tarball doesn't have the configure built
 BuildRequires: intltool
 BuildRequires: gettext
-# Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
 
 Requires(pre): GConf2
@@ -30,19 +38,32 @@ Requires(preun): GConf2
 Requires: gvfs
 
 %description
-A tool to configure user and account details for the mojito social network 
+A tool to configure user and account details for the libsocialweb social network 
 aggregation service.
 
+%package devel
+Summary: Development package for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+Files for development with %{name}.
+
 %prep
 %setup -q
+%patch0 -p1 -b .disablecapplet
 
-# Don't run configure from autogen.sh
-sed -i 's|echo|exit 0|g' autogen.sh
-./autogen.sh
+autoreconf
 
 %build
-%configure --disable-static --disable-schemas
-make %{?_smp_mflags}
+%configure --disable-static --disable-schemas --disable-capplet
+
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
@@ -53,6 +74,10 @@ desktop-file-validate %{buildroot}/%{_da
 
 %find_lang %{name}
 
+# Remove libtool archives and static libs
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.a' -exec rm -f {} ';'
+
 %clean
 rm -rf %{buildroot}
 
@@ -64,6 +89,7 @@ gconftool-2 --makefile-uninstall-rule \
 fi
 
 %post
+/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
@@ -77,6 +103,7 @@ gconftool-2 --makefile-uninstall-rule \
 fi
 
 %postun
+/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -87,13 +114,27 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS TODO
+%doc COPYING AUTHORS
 %{_bindir}/bisho
+%{_libdir}/bisho
+%{_libdir}/libbisho-common.so.*
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/bisho
+%{_libdir}/libbisho-common.so
+%{_libdir}/pkgconfig/bisho.pc
+
 %changelog
+* Sun Jul 11 2010 Peter Robinson <pbrobinson at gmail.com> 0.25.1-1
+- New upstream 0.25.1 release
+
+* Sun Feb 18 2010 Peter Robinson <pbrobinson at gmail.com> 0.20.0-2
+- Update dependencies for new release
+
 * Sun Feb 18 2010 Peter Robinson <pbrobinson at gmail.com> 0.20.0-1
 - New upstream 0.20.0 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Feb 2010 16:46:12 -0000	1.9
+++ sources	11 Jul 2010 12:18:37 -0000	1.10
@@ -1 +1 @@
-e08520fe56d10ab2f38dc56fc77141f1  bisho-0.20.0.tar.bz2
+9127b551bc2459fde20d71b2d551d124  bisho-0.25.1.tar.gz

