Hello community, here is the log from the commit of package jhbuild for openSUSE:Factory checked in at 2015-03-01 14:46:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jhbuild (Old) and /work/SRC/openSUSE:Factory/.jhbuild.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jhbuild" Changes: -------- --- /work/SRC/openSUSE:Factory/jhbuild/jhbuild.changes 2014-05-05 21:18:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jhbuild.new/jhbuild.changes 2015-03-01 14:46:57.000000000 +0100 @@ -1,0 +2,18 @@ +Thu Feb 26 16:59:13 UTC 2015 - dimstar@opensuse.org + +- Update to version 3.16.0~20150225: + + sysdeps-3.16: add libssh + + apps-3.16: libgit2 should be built with SSH support + + sysdeps-3.16: fixup for libssh + + sysdeps-3.16: another fixup for libssh + + gnome-world: remove some CVS modules + + cvs: don't write empty passwords to ~/.cvspass + + 3.16: rename libssh to libssh2 + + triggers: fix LiteralMatch vs REMatch problems + + Switch cogl branch to 1.20 + + Updated Greek translation +- Add create-deps.sh: Extract dependencies from the provided + modulesets. Version specified by moduleset defines (currently set + to be 3.16). + +------------------------------------------------------------------- Old: ---- jhbuild-3.12.0.tar.xz New: ---- _service _servicedata create-deps.sh jhbuild-3.16.0~20150225.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jhbuild.spec ++++++ --- /var/tmp/diff_new_pack.nqJtv0/_old 2015-03-01 14:46:57.000000000 +0100 +++ /var/tmp/diff_new_pack.nqJtv0/_new 2015-03-01 14:46:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package jhbuild # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,20 @@ # +%define moduleset 3.16 Name: jhbuild -Version: 3.12.0 +Version: 3.16.0~20150225 Release: 0 Summary: Tool to build GNOME License: GPL-2.0+ Group: Development/Tools/Building Url: http://live.gnome.org/Jhbuild -Source0: http://download.gnome.org/sources/jhbuild/3.12/%{name}-%{version}.tar.xz +Source0: %{name}-%{version}.tar.xz Source1: README.deps Source2: sample.jhbuildrc +Source99: create-deps.sh BuildRequires: fdupes +BuildRequires: gnome-common BuildRequires: intltool BuildRequires: pkg-config BuildRequires: python @@ -34,16 +37,13 @@ BuildRequires: update-desktop-files BuildRequires: yelp-tools Requires: python-gtk +Recommends: %{name}-lang Recommends: git-core Recommends: patch Recommends: subversion Suggests: cvs -Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires -%if %suse_version <= 1110 -%define python_sitelib %{py_sitedir} -%endif %description Jhbuild is a tool used to build the whole GNOME desktop from the @@ -54,140 +54,85 @@ Summary: Recommended dependencies to use jhbuild Group: Development/Tools/Building Requires: %{name} = %{version} +# Manual extracted deps from moduleset-3.16 +Requires: bison +Requires: cmake +Requires: cracklib-devel +Requires: cups-devel +Requires: db-devel +Requires: doxygen +Requires: flex +Requires: font-util +Requires: gettext-tools +Requires: gperf +Requires: intltool +Requires: libacl-devel +Requires: libcap-devel +Requires: libiw-devel +Requires: libtiff-devel +Requires: libwebp-devel +Requires: libyaml-devel +Requires: makeinfo +Requires: mpfr-devel +Requires: pam-devel +Requires: ppp-devel +Requires: python-libxml2 +Requires: python-rdflib +Requires: ragel +Requires: raptor +Requires: sqlite +Requires: xmlto +Recommends: autoconf +Recommends: automake # Note: the order is order in jhbuild moduleset files ## Compilers Recommends: gcc-c++ ## From bootstrap: Recommends: gettext-tools -Recommends: autoconf Recommends: libtool -Recommends: automake Recommends: pkg-config Recommends: python -Recommends: guile -## From external dependencies: -# skipping libdaemon-devel: only needed to build avahi -# should bring all of avahi -Recommends: libavahi-gobject-devel -# skipping libpixman-1-0-devel: only needed to build cairo -Recommends: cairo-devel -Recommends: cairomm-devel -Recommends: clutter-devel -Recommends: clutter-gtk-devel -Recommends: dbus-1-devel -Recommends: dbus-1-glib-devel -Recommends: dbus-1-python-devel -Recommends: desktop-file-utils -Recommends: enchant-devel -Recommends: fontconfig-devel -Recommends: libgnutls-devel -# skipping libvolume_id-devel: only needed to build hal -# skipping hal-devel: it's deprecated -Recommends: libgudev-1_0-devel -Recommends: libdevkit-power-gobject-devel -Recommends: udisks-devel -Recommends: hicolor-icon-theme -Recommends: icon-naming-utils -Recommends: iso-codes-devel -Recommends: libcroco-devel -# skipping libgpg-error-devel: only needed to build libgcrypt -Recommends: libgcrypt-devel -Recommends: libmusicbrainz-devel -Recommends: libmusicbrainz3-devel -Recommends: libtasn1-devel -Recommends: libxklavier-devel -Recommends: libxml2-devel -Recommends: libxslt-devel -Recommends: gtk-vnc-devel -# should bring all of ndesk-dbus -Recommends: ndesk-dbus-glib-devel -# should bring all of poppler -Recommends: libpoppler-glib-devel -Recommends: orc -Recommends: python-cairo-devel -Recommends: shared-mime-info -Recommends: startup-notification-devel -Recommends: telepathy-glib-devel -Recommends: telepathy-mission-control-devel -Recommends: mozilla-nspr-devel -Recommends: mozilla-nss-devel -Recommends: mozilla-xulrunner20-devel -Recommends: rarian-devel -Recommends: libexpat-devel -Recommends: autogen -# skipping libgdiplus: only needed to build mono -Recommends: mono-devel -Recommends: mono-addins -Recommends: sqlite3-devel -Recommends: polkit-devel -# skipping speex-devel, libsndfile-devel: only needed to build libcanberra -Recommends: libcanberra-devel -Recommends: libpulse-devel -Recommends: libproxy-devel -Recommends: libunique-devel -Recommends: intltool -Recommends: libical-devel -Recommends: gstreamer-0_10-plugins-farsight -# skipping libnice-devel, farsight2-devel: only needed to build telepathy-farsight -Recommends: telepathy-farsight-devel -Recommends: libnotify-devel -Recommends: libgda-4_0-devel -Recommends: libwebkit-devel -Recommends: libchamplain-devel -Recommends: libgdata-devel -Recommends: gmime-2_4-devel -## For some modules: -# gtk+ -Recommends: cups-devel -# gnome-keyring -Recommends: pam-devel -## Other useful stuff: -Recommends: NetworkManager-devel -# Helps gtk-doc build better docs -Recommends: source-highlight +## System Dependencies as defined by the moduleset configuration +# only pkg-config deps are auto extracted, as we do not have to +# worry about package names there +%(sh %{SOURCE99} %{SOURCE0} %{moduleset}) %description recommended-deps Jhbuild is a tool used to build the whole GNOME desktop from the git source, however, it can be used to build other projects creating a moduleset for it. -This package will install some usual dependencies to build GNOME -with jhbuild, to make this tool easier to use on openSUSE. +This package will install the dependencies to build GNOME +with jhbuild, to make this tool easier to use on openSUSE +The list is extracted from the moduleset version %{moduleset} %lang_package + %prep %setup -q translation-update-upstream -cp %{S:1} . -cp %{S:2} . +cp %{SOURCE1} . +cp %{SOURCE2} . %build +NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-scrollkeeper -%__make %{?jobs: -j%jobs} +make %{?_smp_mflags} %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} %suse_update_desktop_file jhbuild %fdupes %{buildroot}%{python_sitelib} %fdupes %{buildroot}%{_datadir} %find_lang %{name} %{?no_lang_C} -%clean -rm -rf %{buildroot} - -%if 0%{?suse_version} > 1130 - %post %desktop_database_post -%endif - -%if 0%{?suse_version} > 1130 %postun %desktop_database_postun -%endif %files %defattr(-,root,root,-) @@ -203,5 +148,6 @@ %doc README.deps %files lang -f %{name}.lang +%defattr(-,root,root) %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">git://git.gnome.org/jhbuild</param> <param name="scm">git</param> <param name="versionformat">3.16.0~%cd</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://git.gnome.org/jhbuild</param> <param name="changesrevision">3f42bd1310ee0f77774020247cda78b03d344205</param></service></servicedata>++++++ create-deps.sh ++++++ #!/bin/bash TARBALL=$1 MODULE=$2 tar -Oxf "$1" --wildcards */modulesets/gnome-sysdeps-${2}.modules | \ grep -o "<pkg-config>\(.*\)</pkg-config>" | \ sed -e "s|\?pkg-config>||g" \ -e "s|\.pc\$|)|g" \ -e "s|^|Requires: pkgconfig(|g" | sort -u | \ grep -v -e "pkgconfig(bdw-gc-threaded)" -e "pkgconfig(lttng-ust)" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org