Hello community, here is the log from the commit of package geda-gaf for openSUSE:Factory checked in at 2019-08-05 10:38:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geda-gaf (Old) and /work/SRC/openSUSE:Factory/.geda-gaf.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geda-gaf" Mon Aug 5 10:38:24 2019 rev:11 rq:720273 version:1.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/geda-gaf/geda-gaf.changes 2018-05-10 15:49:25.597205119 +0200 +++ /work/SRC/openSUSE:Factory/.geda-gaf.new.4126/geda-gaf.changes 2019-08-05 10:38:29.487319282 +0200 @@ -1,0 +2,40 @@ +Wed Jul 31 22:54:06 CEST 2019 - [email protected] + +- Prevent conflict of libgeda42-data and libgeda45-data: + * Rename package with unversioned files to libgeda-data. + * Move versioned lang files to libgeda45. +- Process with spec-cleaner. + +------------------------------------------------------------------- +Fri Mar 22 09:54:14 UTC 2019 - Jonathan Brielmaier <[email protected]> + +- Update to version 1.9.2: + * Guile 2.0 or newer is now required + * `gpstoimage' has been removed from the distribution; equivalent + functionality is provided by the `gaf' command. + * `convert_sym.awk' has been removed from the distribution; equivalent + functionality is provided by the `convert_sym' command. + * New scheme procedures and hooks have been added + * Removal of some scripts and programs + * Updated translations + * Various bugfixes + For more details see: /usr/share/doc/packages/geda-gaf/NEWS +- New subpackages: + * libgedacairo45 + * libgedacairo-devel +- Add patches: + * geda-gaf-disable-failing-tests.patch: disable failing tests + * geda-gaf-enable-guile-2.2.patch: enable guile-2.2 on Factory/TW +- Increase version of libgeda to 45 +- Install more languages files +- Add and remove files for packages where necessary +- Remove unnecessary requires on libgeda, which are found by rpm + itself +- Update source link +- Improve phrasing in summaries +- Fixes boo#1117307: geda-gaf now requires at least guile-2.0 and + seems to work also with guile-2.2 +- Remove deprecated defattr statements +- Use license and doc macro + +------------------------------------------------------------------- Old: ---- geda-gaf-1.8.2.tar.gz New: ---- geda-gaf-1.9.2.tar.gz geda-gaf-disable-failing-tests.patch geda-gaf-enable-guile-2.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geda-gaf.spec ++++++ --- /var/tmp/diff_new_pack.i5u3qG/_old 2019-08-05 10:38:30.347319177 +0200 +++ /var/tmp/diff_new_pack.i5u3qG/_new 2019-08-05 10:38:30.351319177 +0200 @@ -1,7 +1,7 @@ # # spec file for package geda-gaf # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,19 +12,20 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define libgeda_major 45 +%define libgedacairo_major 1 Name: geda-gaf -Version: 1.8.2 +Version: 1.9.2 Release: 0 -%define libgeda_major 42 Summary: Electronic Design Automation Toolsuite License: GPL-2.0-or-later Group: Productivity/Scientific/Electronics -Url: http://geda-project.org/ -Source0: http://ftp.geda-project.org/geda-gaf/stable/v1.8/%{version}/%{name}-%{version}.tar.gz +URL: http://geda-project.org/ +Source0: http://ftp.geda-project.org/geda-gaf/unstable/v1.9/%{version}/%{name}-%{version}.tar.gz Source1: geda-gaf-rpmlintrc # PATCH-FIX-OPENSUSE gschem-doc-path.patch -- set correct path to documentation Patch0: gschem-doc-path.patch @@ -32,7 +33,10 @@ Patch1: grenum-no-build-time.patch # PATCH-FIX-UPSTREAM fix-gxyrs-utility.patch bnc#1078838 -- fix unittests on tumbleweed Patch2: fix-gxyrs-utility.patch - +# PATCH-FIX-OPENSUSE geda-gaf-disable-failing-tests.patch -- disable failing tests +Patch3: geda-gaf-disable-failing-tests.patch +# PATCH-FIX-OPENSUSE geda-gaf-enable-guile-2.2.patch -- enable guile-2.2 (for Factory/TW) +Patch4: geda-gaf-enable-guile-2.2.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: doxygen @@ -45,14 +49,13 @@ BuildRequires: guile-devel BuildRequires: intltool BuildRequires: libstroke-devel +# Required for Patch4 +BuildRequires: libtool BuildRequires: perl-XML-Parser BuildRequires: pkg-config BuildRequires: shared-mime-info BuildRequires: transfig BuildRequires: update-desktop-files - -BuildRoot: %{_tmppath}/%{name}-%{version}-build - Requires: geda-gattrib = %{version} Requires: geda-gnetlist = %{version} Requires: geda-gschem = %{version} @@ -73,22 +76,31 @@ Summary: Basic Library that is used by several gEDA programs License: GPL-2.0-or-later Group: System/Libraries -Requires: libgeda%{libgeda_major}-data +Requires: libgeda-data >= %{version} %description -n libgeda%{libgeda_major} This package provides the basic library for several gEDA programs related to electronic design automation. -%package -n libgeda%{libgeda_major}-data +%package -n libgeda-data Summary: Data for basic Library that is used by several gEDA programs License: GPL-2.0-or-later Group: Productivity/Scientific/Electronics Requires(post): shared-mime-info Requires(postun): shared-mime-info +# Existed up to Leap 15.1: +Obsoletes: libgeda42-data <= %{version} +# In fact, translations are not provided, but previous versions vere +# incorrectly packaged, and there is no better way to proceed: +Provides: libgeda42-data <= %{version} +# This existed only in OBS project electronics: +Obsoletes: libgeda45-data <= %{version} +Provides: libgeda45-data <= %{version} BuildArch: noarch -%description -n libgeda%{libgeda_major}-data -This package provides data files for libgeda. +%description -n libgeda-data +This package provides data files for libgeda such as icons required by several +gEDA programs. %package -n libgeda-devel Summary: Development files for gEDA @@ -104,11 +116,27 @@ %description -n libgeda-devel This package provides headers for libgeda. +%package -n libgedacairo%{libgedacairo_major} +Summary: Schematic renderer library +License: GPL-2.0-or-later +Group: System/Libraries + +%description -n libgedacairo%{libgedacairo_major} +This package provides a schematic renderer library. + +%package -n libgedacairo-devel +Summary: Development files for libgedacairo +License: GPL-2.0-or-later +Group: Development/Libraries/C and C++ +Requires: libgedacairo%{libgedacairo_major} = %{version} + +%description -n libgedacairo-devel +This package provides headers for libgedacairo. + %package -n geda-base Summary: Common code for gEDA applications License: GPL-2.0-or-later Group: Productivity/Scientific/Electronics -Requires: libgeda%{libgeda_major} = %{version} %description -n geda-base This package provides code common to all gEDA applications. @@ -140,7 +168,6 @@ Group: Productivity/Scientific/Electronics Requires: geda-base = %{version} Requires: geda-symbols = %{version} -Requires: libgeda%{libgeda_major} = %{version} %description -n geda-gattrib With gattrib, attributes of schematic or symbol files can be edited. It has @@ -152,7 +179,6 @@ Group: Productivity/Scientific/Electronics Requires: geda-base = %{version} Requires: geda-symbols = %{version} -Requires: libgeda%{libgeda_major} = %{version} %description -n geda-gnetlist gnetlist is the netlist generator program of the gEDA suite. It reads @@ -166,7 +192,6 @@ Group: Productivity/Scientific/Electronics Requires: geda-base = %{version} Requires: geda-symbols = %{version} -Requires: libgeda%{libgeda_major} = %{version} Recommends: geda-doc %description -n geda-gschem @@ -180,7 +205,6 @@ Group: Productivity/Scientific/Electronics Requires: geda-base = %{version} Requires: geda-symbols = %{version} -Requires: libgeda%{libgeda_major} = %{version} %description -n geda-gsymcheck gsymcheck is a symbol checker of the gEDA suite. It checks symbols for @@ -201,7 +225,6 @@ Group: Productivity/Scientific/Electronics Requires: geda-base = %{version} Requires: geda-symbols = %{version} -Requires: libgeda%{libgeda_major} = %{version} %description -n geda-utils This utility package contains several helper utilities for the gEDA @@ -213,9 +236,13 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build # export LDFLAGS="-lm $LDFLAGS" +# Required for Patch4 +./autogen.sh %configure \ --docdir=%{_docdir}/%{name} \ --disable-static \ @@ -226,7 +253,7 @@ %install %make_install -find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print +find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file -r geda-gschem Education Engineering %suse_update_desktop_file -r geda-gattrib Education Engineering @@ -234,62 +261,66 @@ %fdupes -s %{buildroot}%{_docdir}/geda-gaf/examples %fdupes -s %{buildroot}%{_docdir}/geda-gaf/wiki +%find_lang geda-gaf %find_lang geda-gattrib +%find_lang geda-gnetlist %find_lang geda-gschem +%find_lang geda-gsymcheck %find_lang libgeda%{libgeda_major} -install -Dm 644 {AUTHORS,ChangeLog,COPYING,README,NEWS} %{buildroot}%{_docdir}/%{name}/ - %check -make check +make %{?_smp_mflags} check %post -n libgeda%{libgeda_major} -p /sbin/ldconfig - %postun -n libgeda%{libgeda_major} -p /sbin/ldconfig - -%post -n libgeda%{libgeda_major}-data +%post -n libgedacairo%{libgedacairo_major} -p /sbin/ldconfig +%postun -n libgedacairo%{libgedacairo_major} -p /sbin/ldconfig +%post -n libgeda-data %install_info --info-dir=%{_infodir} %{_infodir}/geda-scheme.info.gz -/usr/bin/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : +%{_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : -%postun -n libgeda%{libgeda_major}-data +%postun -n libgeda-data %install_info_delete --info-dir=%{_infodir} %{_infodir}/geda-scheme.info.gz -/usr/bin/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : +%{_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : %files -%defattr(-,root,root) -%doc %{_docdir}/%{name}/AUTHORS -%doc %{_docdir}/%{name}/ChangeLog -%doc %{_docdir}/%{name}/COPYING -%doc %{_docdir}/%{name}/README -%doc %{_docdir}/%{name}/NEWS +%doc AUTHORS ChangeLog NEWS README -%files -n libgeda%{libgeda_major} -%defattr(-,root,root) +%files -n libgeda%{libgeda_major} -f libgeda%{libgeda_major}.lang %{_libdir}/libgeda.so.%{libgeda_major}* -%files -n libgeda%{libgeda_major}-data -f libgeda%{libgeda_major}.lang -%defattr(-,root,root) +%files -n libgeda-data %dir %{_datadir}/gEDA %dir %{_datadir}/gEDA/scheme +%dir %{_datadir}/gEDA/icons +%dir %{_datadir}/gEDA/icons/hicolor +%dir %{_datadir}/gEDA/icons/hicolor/16x16 +%dir %{_datadir}/gEDA/icons/hicolor/22x22 %{_datadir}/gEDA/gafrc.d %{_datadir}/gEDA/system-gafrc -%{_datadir}/gEDA/prolog.ps %{_datadir}/gEDA/print-colormap-lightbg %{_datadir}/gEDA/print-colormap-darkbg %{_datadir}/gEDA/scheme/geda.scm %{_datadir}/gEDA/scheme/color-map.scm +%{_datadir}/gEDA/icons/hicolor/*/actions* %{_datadir}/icons/hicolor/*/mimetypes/* %{_datadir}/mime/packages/libgeda.xml -%{_infodir}/geda-scheme.info.gz +%{_infodir}/geda-scheme.info%{?ext_info} %files -n libgeda-devel -%defattr(-,root,root) %{_includedir}/libgeda/ %{_libdir}/libgeda.so %{_libdir}/pkgconfig/libgeda.pc +%files -n libgedacairo%{libgedacairo_major} +%{_libdir}/libgedacairo.so.%{libgedacairo_major}* + +%files -n libgedacairo-devel +%{_includedir}/libgedacairo/ +%{_libdir}/libgedacairo.so +%{_libdir}/pkgconfig/libgedacairo.pc + %files -n geda-doc -%defattr(-,root,root) %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/gedadocs.html %doc %{_docdir}/%{name}/nc.pdf @@ -298,21 +329,18 @@ %doc %{_docdir}/%{name}/wiki/ %files -n geda-examples -%defattr(-,root,root) %dir %{_docdir}/%{name} %{_docdir}/%{name}/examples/ %files -n geda-gattrib -f geda-gattrib.lang -%defattr(-,root,root) %{_bindir}/gattrib %{_datadir}/gEDA/system-gattribrc %{_datadir}/gEDA/gattrib-menus.xml %{_datadir}/icons/hicolor/*/apps/geda-gattrib.* %{_datadir}/applications/geda-gattrib.desktop -%{_mandir}/man1/gattrib.1.gz +%{_mandir}/man1/gattrib.1%{?ext_man} -%files -n geda-gnetlist -%defattr(-,root,root) +%files -n geda-gnetlist -f geda-gnetlist.lang %{_bindir}/gnetlist %{_datadir}/gEDA/scheme/gnetlist %{_datadir}/gEDA/system-gnetlistrc @@ -320,10 +348,9 @@ %{_datadir}/gEDA/scheme/gnetlist-post.scm %{_datadir}/gEDA/scheme/gnetlist.scm %{_datadir}/gEDA/scheme/partslist-common.scm -%{_mandir}/man1/gnetlist.1.gz +%{_mandir}/man1/gnetlist.1%{?ext_man} %files -n geda-gschem -f geda-gschem.lang -%defattr(-,root,root) %dir %{_datadir}/gEDA/scheme/gschem %dir %{_datadir}/gEDA/scheme/gschem/core %{_bindir}/gschem @@ -334,15 +361,21 @@ %{_datadir}/gEDA/gschem-colormap-bw %{_datadir}/gEDA/scheme/pcb.scm %{_datadir}/gEDA/scheme/auto-uref.scm +%{_datadir}/gEDA/scheme/auto-refdes.scm %{_datadir}/gEDA/scheme/gschem.scm %{_datadir}/gEDA/scheme/auto-place-attribs.scm +%{_datadir}/gEDA/scheme/auto-place-netname.scm %{_datadir}/gEDA/scheme/print.scm %{_datadir}/gEDA/scheme/default-attrib-positions.scm %{_datadir}/gEDA/scheme/generate_netlist.scm +%{_datadir}/gEDA/scheme/geda-deprecated-config.scm %{_datadir}/gEDA/scheme/image.scm %{_datadir}/gEDA/scheme/list-keys.scm +%{_datadir}/gEDA/scheme/spice-common.scm %{_datadir}/gEDA/scheme/print-NB-attribs.scm +%{_datadir}/gEDA/scheme/gschem/action.scm %{_datadir}/gEDA/scheme/gschem/attrib.scm +%{_datadir}/gEDA/scheme/gschem/builtins.scm %{_datadir}/gEDA/scheme/gschem/core/gettext.scm %{_datadir}/gEDA/scheme/gschem/deprecated.scm %{_datadir}/gEDA/scheme/gschem/gschemdoc.scm @@ -354,66 +387,51 @@ %{_datadir}/gEDA/bitmap %{_datadir}/icons/hicolor/*/apps/geda-gschem.* %{_datadir}/applications/geda-gschem.desktop -%{_mandir}/man1/gschem.1.gz +%{_mandir}/man1/gschem.1%{?ext_man} %files -n geda-base +%license COPYING %dir %{_datadir}/gEDA/scheme/geda %dir %{_datadir}/gEDA/scheme/geda/core %{_datadir}/gEDA/scheme/geda/attrib.scm +%{_datadir}/gEDA/scheme/geda/config.scm %{_datadir}/gEDA/scheme/geda/deprecated.scm %{_datadir}/gEDA/scheme/geda/object.scm %{_datadir}/gEDA/scheme/geda/os.scm %{_datadir}/gEDA/scheme/geda/page.scm %{_datadir}/gEDA/scheme/geda/core/gettext.scm -%files -n geda-gsymcheck -%defattr(-,root,root) +%files -n geda-gsymcheck -f geda-gsymcheck.lang %{_bindir}/gsymcheck %{_datadir}/gEDA/system-gsymcheckrc -%{_mandir}/man1/gsymcheck.1.gz +%{_mandir}/man1/gsymcheck.1%{?ext_man} %files -n geda-symbols -%defattr(-,root,root) %{_datadir}/gEDA/sym -%files -n geda-utils -%defattr(-,root,root) -%{_bindir}/convert_sym +%files -n geda-utils -f geda-gaf.lang +%{_bindir}/gaf %{_bindir}/garchive -%{_bindir}/gmk_sym %{_bindir}/grenum %{_bindir}/gsch2pcb %{_bindir}/gschlas %{_bindir}/gsymfix %{_bindir}/gxyrs -%{_bindir}/olib -%{_bindir}/pads_backannotate %{_bindir}/pcb_backannotate %{_bindir}/refdes_renum -%{_bindir}/sarlacc_schem -%{_bindir}/sarlacc_sym %{_bindir}/schdiff -%{_bindir}/smash_megafile -%{_bindir}/sw2asc %{_bindir}/tragesym -%{_mandir}/man1/convert_sym.1.gz -%{_mandir}/man1/garchive.1.gz -%{_mandir}/man1/gmk_sym.1.gz -%{_mandir}/man1/grenum.1.gz -%{_mandir}/man1/gsch2pcb.1.gz -%{_mandir}/man1/gschlas.1.gz -%{_mandir}/man1/gsymfix.1.gz -%{_mandir}/man1/gxyrs.1.gz -%{_mandir}/man1/olib.1.gz -%{_mandir}/man1/pads_backannotate.1.gz -%{_mandir}/man1/pcb_backannotate.1.gz -%{_mandir}/man1/refdes_renum.1.gz -%{_mandir}/man1/sarlacc_schem.1.gz -%{_mandir}/man1/sarlacc_sym.1.gz -%{_mandir}/man1/schdiff.1.gz -%{_mandir}/man1/smash_megafile.1.gz -%{_mandir}/man1/sw2asc.1.gz -%{_mandir}/man1/tragesym.1.gz +%{_mandir}/man1/gaf.1%{?ext_man} +%{_mandir}/man1/garchive.1%{?ext_man} +%{_mandir}/man1/grenum.1%{?ext_man} +%{_mandir}/man1/gsch2pcb.1%{?ext_man} +%{_mandir}/man1/gschlas.1%{?ext_man} +%{_mandir}/man1/gsymfix.1%{?ext_man} +%{_mandir}/man1/gxyrs.1%{?ext_man} +%{_mandir}/man1/pcb_backannotate.1%{?ext_man} +%{_mandir}/man1/refdes_renum.1%{?ext_man} +%{_mandir}/man1/schdiff.1%{?ext_man} +%{_mandir}/man1/tragesym.1%{?ext_man} %{_datadir}/gEDA/perl/ %{_datadir}/gEDA/system-gschlasrc ++++++ geda-gaf-1.8.2.tar.gz -> geda-gaf-1.9.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/geda-gaf/geda-gaf-1.8.2.tar.gz /work/SRC/openSUSE:Factory/.geda-gaf.new.4126/geda-gaf-1.9.2.tar.gz differ: char 5, line 1 ++++++ geda-gaf-disable-failing-tests.patch ++++++ --- geda-gaf-1.9.2/libgeda/scheme/Makefile.am.orig 2019-03-22 10:14:32.558929363 +0100 +++ geda-gaf-1.9.2/libgeda/scheme/Makefile.am 2019-03-22 10:14:58.758913793 +0100 @@ -41,15 +41,10 @@ unit-tests/t0207-page-parse-line-endings.scm \ unit-tests/t0208-page-parse-embed-no-complex.scm \ unit-tests/t0300-attribute.scm \ - unit-tests/t0301-promotable-attributes.scm \ unit-tests/t0400-os.scm \ unit-tests/t0401-os-expand-env-variables.scm \ - unit-tests/t0402-config.scm \ unit-tests/t1000-deprecated.scm -XFAIL_TESTS = \ - unit-tests/t0301-promotable-attributes.scm - dist_noinst_DATA = geda/core/gettext.scm.in unit-test.scm $(TESTS) geda/core/gettext.scm: $(srcdir)/geda/core/gettext.scm.in Makefile ++++++ geda-gaf-enable-guile-2.2.patch ++++++ --- geda-gaf-1.9.2/m4/geda-guile.m4.orig 2019-03-22 08:26:51.252381617 +0100 +++ geda-gaf-1.9.2/m4/geda-guile.m4 2019-03-22 08:27:36.448305958 +0100 @@ -35,13 +35,13 @@ GUILE_MIN_TEENY=`echo ${GUILE_MIN_VER} | sed -e 's;.*\.;;'` _found_pkg_config_guile=yes - PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER], - [GUILE_PKG_NAME=guile-2.0], [_found_pkg_config_guile=no]) + PKG_CHECK_MODULES(GUILE, [guile-2.2 >= $GUILE_MIN_VER], + [GUILE_PKG_NAME=guile-2.2], [_found_pkg_config_guile=no]) if test "${_found_pkg_config_guile}" = "no" ; then - PKG_CHECK_MODULES(GUILE, [guile-1.8 >= $GUILE_MIN_VER], + PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER], [_found_pkg_config_guile=yes - GUILE_PKG_NAME=guile-1.8], + GUILE_PKG_NAME=guile-2.0], [_found_pkg_config_guile=no]) fi
