Hello community, here is the log from the commit of package balsa for openSUSE:Factory checked in at Tue Mar 22 17:59:25 CET 2011.
-------- --- GNOME/balsa/balsa.changes 2011-02-12 20:23:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/balsa/balsa.changes 2011-03-22 16:32:50.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 21 20:10:45 CET 2011 - sbra...@suse.cz + +- Support touchscreen version of balsa. +- Fixed URL. +- Added desktop file integration patch (bgo#645444). +- Fixed libnotify for 11.3 and older. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- balsa-mail-handler.patch balsa-new-autotools.patch pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ balsa.spec ++++++ --- /var/tmp/diff_new_pack.GMkI14/_old 2011-03-22 17:58:24.000000000 +0100 +++ /var/tmp/diff_new_pack.GMkI14/_new 2011-03-22 17:58:24.000000000 +0100 @@ -18,16 +18,21 @@ Name: balsa +%define TOUCHSCREEN_OPTIMIZATION %(echo %{name} | grep -qv touchscreen ; echo $?) +%define base_name balsa Version: 2.4.9 -Release: 2 +Release: 7 License: GPLv2+ Summary: The GNOME Mail Program -Url: http://balsa.gnome.org/ +Url: http://pawsa.fedorapeople.org/balsa/ Group: Productivity/Networking/Email/Clients -Source: %{name}-%{version}.tar.bz2 +Source: %{base_name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM balsa-fix-scrollkeeper.patch bgo#636805 vu...@opensuse.org -- Respect --disable-scrollkeeper Patch0: balsa-fix-scrollkeeper.patch -%define TOUCHSCREEN_OPTIMIZATION 0 +# PATCH-FEATURE-UPSTREAM balsa-mail-handler.patch bgo645444 sbra...@suse.cz -- Offer balsa in gnome-default-applications-properties. +Patch1: balsa-mail-handler.patch +# PATCH-FEATURE-UPSTREAM balsa-new-autotools.patch bgo645530 sbra...@suse.cz -- Fix for new autoconf, fix minimal libnotify version. +Patch2: balsa-new-autotools.patch BuildRequires: compface BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel @@ -58,19 +63,36 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(unique-1.0) BuildRequires: pkgconfig(webkit-1.0) -Recommends: %{name}-lang +Recommends: %{base_name}-lang +%if "%{name}" != "%{base_name}" +Conflicts: %{base_name} +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +# lang packages are exactly equal for both balsa variants. Build it only once: +%if "%{name}" == "%{base_name}" +%define BUILD_LANG 1 +%else +%define BUILD_LANG 0 +%endif %description Nice GUI program to manage e-mail. +%if %BUILD_LANG %lang_package +%endif + %prep -%setup -q +%setup -q -n %{base_name}-%{version} translation-update-upstream %patch0 -p1 +mv balsa.desktop.in balsa.desktop.in.in +cp -a balsa.desktop.in.in balsa-mailto-handler.desktop.in.in +%patch1 -p1 +%patch2 -p1 %build +mkdir -p m4 ; gnome-doc-prepare -f ; autoreconf -f -i %configure\ %if %TOUCHSCREEN_OPTIMIZATION --enable-touch-ui\ @@ -96,8 +118,14 @@ %makeinstall # Change sr@Latn to sr@latin mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin -%suse_update_desktop_file -G "Mail Client" %{name} -%find_lang balsa %{?no_lang_C} +%suse_update_desktop_file -G "Mail Client" %{base_name} +%suse_update_desktop_file -G "Mail Client" %{base_name}-mailto-handler +%if %BUILD_LANG +%find_lang %{base_name} %{?no_lang_C} +%else +rm -r %{buildroot}%{_datadir}/locale %{buildroot}%{_datadir}/omf %{buildroot}%{_datadir}/gnome/help +rmdir %{buildroot}%{_datadir}/gnome +%endif %fdupes %{buildroot}%{_datadir} %clean @@ -137,6 +165,9 @@ %doc %{_mandir}/man1/balsa.1* %config %{_sysconfdir}/sound/events/*.soundlist -%files lang -f balsa.lang +%if %BUILD_LANG + +%files lang -f %{base_name}.lang +%endif %changelog ++++++ balsa-fix-scrollkeeper.patch ++++++ --- /var/tmp/diff_new_pack.GMkI14/_old 2011-03-22 17:58:25.000000000 +0100 +++ /var/tmp/diff_new_pack.GMkI14/_new 2011-03-22 17:58:25.000000000 +0100 @@ -32,3 +32,18 @@ fi # glib-genmarshal +Index: balsa-2.4.9/configure.in +=================================================================== +--- balsa-2.4.9.orig/configure.in ++++ balsa-2.4.9/configure.in +@@ -246,10 +246,8 @@ AM_CONDITIONAL([BUILD_WITH_G_D_U], [test + if test $with_g_d_u = yes ; then + GNOME_DOC_INIT + AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[true]) +-AM_CONDITIONAL([ENABLE_SK],[true]) + else + AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[false]) +-AM_CONDITIONAL([ENABLE_SK],[false]) + fi + + # glib-genmarshal ++++++ balsa-mail-handler.patch ++++++ Index: balsa-2.4.9/configure.in =================================================================== --- balsa-2.4.9.orig/configure.in +++ balsa-2.4.9/configure.in @@ -281,6 +281,7 @@ dnl #################################### dnl GNOME libs dnl ##################################################################### if test x$with_gnome != xno; then + TOOLKIT_CATEGORIES="GNOME;GTK;" gnome_extras="libgnome-2.0 libgnomeui-2.0 libbonobo-2.0 gconf-2.0" AC_MSG_CHECKING([whether we have gnome-keyring]) if $PKG_CONFIG --atleast-version=1.0 gnome-keyring-1; then @@ -298,9 +299,11 @@ if test x$with_gnome != xno; then AC_MSG_RESULT($with_gnome_keyring) AC_DEFINE(HAVE_GNOME,1,[Defined when gnome libs are available.]) else + TOOLKIT_CATEGORIES="GTK;" gnome_extras="" fi AM_CONDITIONAL([BUILD_WITH_GNOME], [test $with_gnome = "yes"]) +AC_SUBST(TOOLKIT_CATEGORIES) dnl ##################################################################### dnl 4. Libraries. @@ -997,6 +1000,8 @@ AC_OUTPUT([ Makefile balsa.1 balsa.spec +balsa.desktop.in +balsa-mailto-handler.desktop.in po/Makefile.in sounds/Makefile images/Makefile Index: balsa-2.4.9/Makefile.am =================================================================== --- balsa-2.4.9.orig/Makefile.am +++ balsa-2.4.9/Makefile.am @@ -9,8 +9,8 @@ pixmapdir = $(datadir)/pixmaps pixmap_DATA = gnome-balsa2.png desktopdir = $(datadir)/applications -desktop_in_files = balsa.desktop.in -desktop_DATA = balsa.desktop +desktop_in_files = balsa.desktop.in balsa-mailto-handler.desktop.in +desktop_DATA = balsa.desktop balsa-mailto-handler.desktop @INTLTOOL_DESKTOP_RULE@ balsa_extra_dist = \ @@ -19,7 +19,6 @@ balsa_extra_dist = \ balsa-mail-style.xml \ balsa-mail.lang \ balsa.1.in \ - balsa.desktop.in \ balsa.spec.in \ bootstrap.sh \ docs/mh-mail-HOWTO \ Index: balsa-2.4.9/balsa.desktop.in.in =================================================================== --- balsa-2.4.9.orig/balsa.desktop.in +++ balsa-2.4.9/balsa.desktop.in.in @@ -1,6 +1,8 @@ [Desktop Entry] _Name=Balsa _Comment=E-Mail utility +_GenericName=Mail Client +X-GNOME-FullName=Balsa Mail Client TryExec=balsa Exec=balsa Icon=gnome-balsa2 @@ -9,4 +9,4 @@ Icon=gnome-balsa2 Terminal=false Type=Application StartupNotify=true -Categories=GNOME;Network;Email; +Categories=@TOOLKIT_CATEGORIES@Network;Email; Index: balsa-2.4.9/balsa-mailto-handler.desktop.in.in =================================================================== --- balsa-2.4.9.orig/balsa.desktop.in +++ balsa-2.4.9/balsa-mailto-handler.desktop.in.in @@ -1,10 +1,14 @@ [Desktop Entry] _Name=Balsa _Comment=E-Mail utility +_GenericName=Mail Client +X-GNOME-FullName=Balsa Mail Client TryExec=balsa -Exec=balsa +Exec=balsa -m %U Icon=gnome-balsa2 Terminal=false Type=Application StartupNotify=true -Categories=GNOME;Network;Email; +Categories=@TOOLKIT_CATEGORIES@Network;Email; +MimeType=x-scheme-handler/mailto; +NoDisplay=true ++++++ balsa-new-autotools.patch ++++++ Index: balsa-2.4.9/configure.in =================================================================== --- balsa-2.4.9.orig/configure.in +++ balsa-2.4.9/configure.in @@ -713,8 +713,8 @@ fi # Libnotify configuration if test x$with_libnotify != xno; then PKG_CHECK_MODULES(NOTIFY, [ libnotify >= 0.7.0 ], [notifyver=7], - PKG_CHECK_MODULES(NOTIFY, [ libnotify >= 0.5.0 ], [notifyver=5], - [AC_MSG_ERROR([*** You enabled notify but the library is not found.])])) + [PKG_CHECK_MODULES(NOTIFY, [ libnotify >= 0.4.0 ], [notifyver=4], + [AC_MSG_ERROR([*** You enabled notify but the library is not found.])])]) AC_DEFINE_UNQUOTED(HAVE_NOTIFY,$notifyver, [Defined when libnotify can be used.]) BALSA_LIBS="$BALSA_LIBS $NOTIFY_LIBS" ++++++ pre_checkin.sh ++++++ #!/bin/bash CANONICAL_NAME=balsa # Actually, this file is dummy. Touchscreen version does not work properly. (bgo#641735) #VARIANTS=("" -touchscreen) for VAR in "${VARIANTS[@]}" ; do NAME=$CANONICAL_NAME$VAR if test $NAME = $CANONICAL_NAME ; then continue fi if test $CANONICAL_NAME.spec -ot $NAME.spec ; then echo "$CANONICAL_NAME.spec is older than $NAME.spec. Please merge changes manually and call pre-checkin.sh again." exit 1 fi if test $CANONICAL_NAME.changes -ot $NAME.changes ; then echo "$CANONICAL_NAME.changes is older than $NAME.changes. Please merge changes manually and call pre-checkin.sh again." exit 1 fi sed "s/^Name: *$CANONICAL_NAME$/&$VAR/" <$CANONICAL_NAME.spec >$NAME.spec cp -a $CANONICAL_NAME.changes $NAME.changes done touch $CANONICAL_NAME.spec $CANONICAL_NAME.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org