Hello community, here is the log from the commit of package gcompris for openSUSE:Factory checked in at 2018-06-02 12:12:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcompris (Old) and /work/SRC/openSUSE:Factory/.gcompris.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcompris" Sat Jun 2 12:12:52 2018 rev:16 rq:613328 version:17.05 Changes: -------- --- /work/SRC/openSUSE:Factory/gcompris/gcompris.changes 2018-03-14 19:37:29.992479836 +0100 +++ /work/SRC/openSUSE:Factory/.gcompris.new/gcompris.changes 2018-06-02 12:13:36.284784617 +0200 @@ -1,0 +2,9 @@ +Sat May 19 20:35:06 UTC 2018 - bjorn....@gmail.com + +- Clean up spec file, remove all obsolete conditionals, and remove + all non openSUSE Build parts, run spec-cleaner. +- Drop a lot of unneeded and outdated BuildRequires, add + BuildRequires (pkgconfig-style mostly) following what configure + really looks for. Drop Requires from the devel subpackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcompris.spec ++++++ --- /var/tmp/diff_new_pack.uwAdnV/_old 2018-06-02 12:13:45.396450412 +0200 +++ /var/tmp/diff_new_pack.uwAdnV/_new 2018-06-02 12:13:45.400450266 +0200 @@ -17,104 +17,51 @@ Name: gcompris +Version: 17.05 +Release: 0 Summary: Multiactivity educational software for children aged 2–10 License: GPL-3.0-or-later Group: Amusements/Teaching/Other -Version: 17.05 -Release: 0 -Url: http://gcompris.net +URL: http://gcompris.net Source0: %{name}-%{version}.tar.bz2 Source1: gcompris.desktop Source2: gcompris-edit.desktop Source3: gcompris-rpmlintrc Source4: gcompris.6 + +# PATCH-FIX-UPSTREAM gcompris-13.11-remove_build_date.patch -- Make build reproducible Patch1: gcompris-13.11-remove_build_date.patch -# work around solver bug, require the package instead the lib # PATCH-FIX-UPSTREAM gcompris-gstreamer-1.0.patch bgo#747949 deb#785840 badshah...@gmail.com -- Port to gstreamer 1.0; patch taken from debian patch tracker Patch2: gcompris-gstreamer-1.0.patch + BuildRequires: autoconf BuildRequires: automake -BuildRequires: gettext-devel +BuildRequires: fdupes +BuildRequires: gnome-common BuildRequires: gnuchess >= 5.02 BuildRequires: intltool BuildRequires: libtool BuildRequires: makeinfo BuildRequires: pkgconfig -BuildRequires: python-devel BuildRequires: sqlite-devel >= 3 -%if 0%{?sles_version} -BuildRequires: gtk2-devel -BuildRequires: libxml2-devel -%else +BuildRequires: texi2html +BuildRequires: texinfo +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(gmodule-no-export-2.0) +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libxml-2.0) -%endif +BuildRequires: pkgconfig(pycairo) +BuildRequires: pkgconfig(pygtk-2.0) Requires: gcompris-voices >= %{version} Requires: gnucap Requires: gnuchess Requires: tuxpaint -########################################### -# Fedora specials -########################################### -%if 0%{?fedora_version} -BuildRequires: desktop-file-utils -BuildRequires: desktop-file-utils -BuildRequires: gnome-python2-devel -BuildRequires: gstreamer-devel -BuildRequires: libX11-devel -BuildRequires: librsvg2-devel -BuildRequires: pycairo-devel -BuildRequires: pygtk2-devel -BuildRequires: texi2html -%if 0%{?fedora} <= 15 -BuildRequires: pypkgconfig(gtk+-2.0) -%else -BuildRequires: gtk+-devel -%endif -%if 0%{?fedora} <= 16 -BuildRequires: python-sqlite2 -Requires: python-sqlite2 -%endif -%endif -########################################### -# Mandriva specials -########################################### -%if 0%{?mandriva_version} -BuildRequires: codeina -BuildRequires: desktop-file-utils -BuildRequires: gnome-python-devel -BuildRequires: gstreamer-devel -BuildRequires: librsvg-devel -BuildRequires: polkit-gnome -BuildRequires: pygtk2.0-devel -BuildRequires: python-sqlite2 -BuildRequires: tetex-texi2html -Requires: python-sqlite2 -%endif -########################################### -# SUSE specials -########################################### -%if 0%{?suse_version} -BuildRequires: fdupes -BuildRequires: gnome-common -BuildRequires: intltool -BuildRequires: libgnome-devel -BuildRequires: libgnomeui-devel -BuildRequires: librsvg-devel -BuildRequires: python-gtk -BuildRequires: python-gtk-devel -BuildRequires: texlive-latex -BuildRequires: update-desktop-files -BuildRequires: pkgconfig(gmodule-no-export-2.0) -BuildRequires: pkgconfig(gstreamer-1.0) -%if 0%{?suse_version} > 1130 # to get rid of the "GLib-GIO-WARNING **: FAMOpen failed, FAMErrno=0" messages, # we need a running FAM server (not mandatory): Recommends: fam-server -%endif -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -#---------------------------------------------------------------------- %description GCompris is an educational software suite comprising of numerous activities @@ -136,19 +83,6 @@ Summary: Development package for gcompris Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Requires: atk-devel -Requires: fontconfig-devel -Requires: freetype2-devel -Requires: gdk-pixbuf-devel -Requires: glibc-devel -Requires: librsvg-devel -Requires: xorg-x11-libX11-devel -Requires: zlib-devel -Requires: pkgconfig(cairo) -Requires: pkgconfig(glib-2.0) -Requires: pkgconfig(gtk+-2.0) -Requires: pkgconfig(libxml-2.0) -Requires: pkgconfig(pango) %description devel This package contains header files for developing new applications with gcompris. @@ -279,9 +213,7 @@ Group: Amusements/Teaching/Other Requires: %{name} = %{version} Provides: gcompris-voices = %{version} -%if 0%{?suse_version} >= 1010 Provides: locale(gcompris:hi) -%endif BuildArch: noarch %description voices-hi @@ -448,12 +380,12 @@ %configure --quiet \ --enable-sqlite \ --disable-static \ - --localstatedir=/var/%{_lib} + --localstatedir=%{_localstatedir}/%{_lib} # --enable-sugar make %{?_smp_mflags} %check -make check +make %{?_smp_mflags} check %install make DESTDIR=%{?buildroot:%{buildroot}} install @@ -475,55 +407,26 @@ done rm -rf %{buildroot}/%{_datadir}/pixmaps fi -%if 0%{?suse_version} + %suse_update_desktop_file -n -N GCompris -G "Educational suite GCompris" gcompris Education Teaching %suse_update_desktop_file -n -N GCompris -G "GCompris Administration" gcompris-edit System SystemSetup # remove old menu entry -rm -rf %{buildroot}/%{_prefix}/lib/menu/gcompris -# -# save space, use fdupes -# - -# REMOVE LIBTOOL ARCHIVE, THESE ARE UNNECESSARY, AND INTRODUCE WARNINGS LIKE: -# Missing "Requires: gtk2-devel" in dependency chain (/usr/lib64/gcompris/libgoocanvas.la from gcompris-devel requires /usr/lib64/libgtk-x11-2.0.so) -rm -fr %{buildroot}%{_libdir}/gcompris/*.la - +rm -rf %{buildroot}/%{_libexecdir}/menu/gcompris +find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot} -%endif + test -f %{buildroot}%{_datadir}/gcompris/boards/voices/recode.sh && chmod +x %{buildroot}%{_datadir}/gcompris/boards/voices/recode.sh # fix old LOCALE dir -%if 0%{?suse_version} > 1110 if [ -d %{buildroot}%{_datadir}/locale/sr@Latn ]; then mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin fi -%endif -# Fedora -%if 0%{?fedora_version} -# install desktop file -desktop-file-install --vendor="%{vendor}" \ - --dir=%{buildroot}/%{_datadir}/applications \ - %{name}.desktop -desktop-file-install --vendor="%{vendor}" \ - --dir=%{buildroot}/%{_datadir}/applications \ - %{name}-edit.desktop -%endif -%if 0%{?mandriva_version} -desktop-file-install --vendor="%{vendor}" \ - --dir=%{buildroot}/%{_datadir}/applications \ - %{name}.desktop -desktop-file-install --vendor="%{vendor}" \ - --dir=%{buildroot}/%{_datadir}/applications \ - %{name}-edit.desktop -%endif %find_lang %{name} %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files -f %{name}.lang -%defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %doc %{_mandir}/man6/gcompris* %dir %{_libdir}/gcompris @@ -543,111 +446,81 @@ %exclude %{_datadir}/gcompris/boards/voices/pt_BR %files devel -%defattr(-, root, root) %{_libdir}/gcompris/libgoocanvas.so %files voices-ar -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/ar %files voices-br -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/br %files voices-cs -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/cs %files voices-da -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/da %files voices-de -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/de %files voices-el -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/el %files voices-en -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/en %files voices-es -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/es %files voices-eu -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/eu %files voices-fi -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/fi %files voices-fr -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/fr %files voices-hi -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/hi %files voices-hu -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/hu %files voices-id -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/id %files voices-it -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/it %files voices-mr -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/mr %files voices-nb -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/nb %files voices-nl -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/nl %files voices-pt -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/pt %files voices-pt-br -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/pt_BR %files voices-ru -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/ru %files voices-so -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/so %files voices-sr -%defattr(-, root, root) -%if 0%{?suse_version} <= 1120 -%dir %{_datadir}/locale/sr_ME -%dir %{_datadir}/locale/sr_ME/LC_MESSAGES -%endif %{_datadir}/gcompris/boards/voices/sr %files voices-sv -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/sv %files voices-tr -%defattr(-, root, root) %{_datadir}/gcompris/boards/voices/tr %changelog
