Hello community, here is the log from the commit of package moblin-app-installer for openSUSE:Factory checked in at Wed Mar 31 18:56:29 CEST 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/moblin-app-installer/moblin-app-installer.changes 2010-03-29 23:58:37.000000000 +0200 @@ -0,0 +1,48 @@ +------------------------------------------------------------------- +Mon Mar 29 21:50:34 UTC 2010 - sreeves@novell.com + +- Add build_with_0.5_PK.patch to fix build with PackageKit 0.5 + +------------------------------------------------------------------- +Thu Nov 19 17:58:55 UTC 2009 - abockover@novell.com + +- Disable the lang package since there are no translations yet + +------------------------------------------------------------------- +Thu Nov 19 17:50:54 UTC 2009 - abockover@novell.com + +- Added disable-tests.patch + +------------------------------------------------------------------- +Thu Nov 19 17:35:16 UTC 2009 - abockover@novell.com + +- Relocate garage.repo from /etc/yum.repos.d to /etc/zypp/repos.d +- Remove /usr/bin/test-* programs +- Filled out %files + +------------------------------------------------------------------- +Thu Nov 19 17:14:16 UTC 2009 - abockover@novell.com + +- Add fixup-desktop-file.patch + +------------------------------------------------------------------- +Thu Nov 19 16:14:26 UTC 2009 - abockover@novell.com + +- Requires gnome-icon-theme + +------------------------------------------------------------------- +Thu Nov 19 16:13:16 UTC 2009 - abockover@novell.com + +- BuildRequires update-desktop-files, use %suse_update_desktop_file + +------------------------------------------------------------------- +Thu Nov 19 15:27:24 UTC 2009 - abockover@novell.com + +- Add support-rpm-without-pkgconfig.patch since 4.6 is not required +- Use proper %lang_package macro + +------------------------------------------------------------------- +Wed Nov 18 02:51:06 UTC 2009 - abockover@novell.com + +- Initial package + calling whatdependson for head-i586 New: ---- build_with_0.5_PK.patch disable-tests.patch fixup-desktop-file.patch moblin-app-installer-0.3.2.tar.bz2 moblin-app-installer.changes moblin-app-installer.spec support-rpm-without-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ moblin-app-installer.spec ++++++ # # spec file for package moblin-app-installer (Version 0.3.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: moblin-app-installer Summary: Moblin App Store client Group: System/GUI/Other Version: 0.3.2 Release: 1 License: GPLv2 Url: http://www.moblin.org Source0: %{name}-%{version}.tar.bz2 Patch0: support-rpm-without-pkgconfig.patch Patch1: fixup-desktop-file.patch Patch2: disable-tests.patch Patch3: build_with_0.5_PK.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libxml2-devel BuildRequires: gtk2-devel BuildRequires: PackageKit-devel BuildRequires: rpm-devel BuildRequires: gnome-common BuildRequires: intltool BuildRequires: gettext BuildRequires: nbtk-devel BuildRequires: update-desktop-files Requires: gnome-icon-theme #Requires: %{name}-lang = %{version} %description The Moblin Application Installer is a client application that is launched from the myzone panel on your Moblin netbook that provides a logically categorized list of applications that you can choose to install. The selection of applications that appear within the Moblin Application Installer come from the Moblin Garage. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %build ./autogen.sh %configure --disable-static export LD_AS_NEEDED=1 make %{?_smp_mflags} %install %makeinstall #%find_lang %{name} || echo -n >> %{name}.lang %suse_update_desktop_file %{name} mkdir -p %{buildroot}/%{_sysconfdir}/zypp/repos.d mv %{buildroot}/%{_sysconfdir}/yum.repos.d/garage.repo \ %{buildroot}/%{_sysconfdir}/zypp/repos.d mkdir -p %{buildroot}/%{_datadir}/doc/%{name}-%{version} for f in `ls %{buildroot}/%{_datadir}/doc/`; do if [ -f %{buildroot}/%{_datadir}/doc/$f ]; then mv %{buildroot}/%{_datadir}/doc/$f %{buildroot}/%{_datadir}/doc/%{name}-%{version} fi done %clean rm -rf %{buildroot} #%lang_package #%files lang -f %{name}.lang %files %defattr(-,root,root,-) %doc COPYING %{_sysconfdir}/zypp/repos.d %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name} %changelog ++++++ build_with_0.5_PK.patch ++++++ Index: moblin-app-installer-0.3.2/configure.ac =================================================================== --- moblin-app-installer-0.3.2.orig/configure.ac +++ moblin-app-installer-0.3.2/configure.ac @@ -33,7 +33,7 @@ deps=' clutter-x11-1.0 gtk+-2.0 packagekit-glib >= 0.4 - packagekit-glib < 0.5' + packagekit-glib < 0.6' PKG_CHECK_EXISTS(rpm >= 4.6, [ Index: moblin-app-installer-0.3.2/src/mai-package.c =================================================================== --- moblin-app-installer-0.3.2.orig/src/mai-package.c +++ moblin-app-installer-0.3.2/src/mai-package.c @@ -1038,7 +1038,7 @@ mai_package_install (MaiPackage *self, ); if (pk_client_reset (priv->client, error)) - ret = pk_client_install_packages (priv->client, package_ids, error); + ret = pk_client_install_packages (priv->client, FALSE, package_ids, error); g_free (package_ids[0]); if (!ret) ++++++ disable-tests.patch ++++++ diff --git a/Makefile.am b/Makefile.am index 61d786b..49c3b8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = build data moblin-panel-copy po src tests tools +SUBDIRS = build data moblin-panel-copy po src tools EXTRA_DIST = \ AUTHORS \ ++++++ fixup-desktop-file.patch ++++++ diff --git a/data/moblin-app-installer.desktop b/data/moblin-app-installer.desktop index ccb70e4..3e7368b 100644 --- a/data/moblin-app-installer.desktop +++ b/data/moblin-app-installer.desktop @@ -1,11 +1,12 @@ [Desktop Entry] Version=1.0 -Name=Moblin Application Installer -Comment=Install garage apps +Name=Moblin Garage +GenericName=Application Installer +Comment=Install garage Exec=moblin-app-installer -Categories=Settings; +Categories=System;GNOME; Icon=system-software-install Type=Application Terminal=false StartupNotify=true - +OnlyShowIn=GNOME; ++++++ support-rpm-without-pkgconfig.patch ++++++ diff --git a/configure.ac b/configure.ac index f6408e2..dc0bff4 100644 --- a/configure.ac +++ b/configure.ac @@ -33,8 +33,14 @@ deps=' clutter-x11-1.0 gtk+-2.0 packagekit-glib >= 0.4 - packagekit-glib < 0.5 - rpm >= 4.6' + packagekit-glib < 0.5' + +PKG_CHECK_EXISTS(rpm >= 4.6, +[ + deps="$deps rpm >= 4.6" +], [ + rpm_libs="-lrpm -lrpmio" +]) AC_MSG_CHECKING([for available nbtk version]) PKG_CHECK_EXISTS(nbtk-1.2, @@ -51,6 +57,8 @@ PKG_CHECK_EXISTS(nbtk-1.2, # FIXME conditionalise rpm / support deb / extend package-kit # to support version comparison. PKG_CHECK_MODULES([MAI], $deps) +MAI_LIBS="$MAI_LIBS $rpm_libs" +AC_SUBST(MAI_LIBS) extra_cflags= if test "$GCC" = "yes"; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org