Hello community, here is the log from the commit of package balsa for openSUSE:Factory checked in at 2018-01-26 13:39:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/balsa (Old) and /work/SRC/openSUSE:Factory/.balsa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "balsa" Fri Jan 26 13:39:16 2018 rev:66 rq:569468 version:2.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/balsa/balsa.changes 2017-12-09 20:31:02.539391417 +0100 +++ /work/SRC/openSUSE:Factory/.balsa.new/balsa.changes 2018-01-26 13:39:16.677915653 +0100 @@ -1,0 +2,9 @@ +Thu Jan 18 09:40:43 UTC 2018 - [email protected] + +- Clean up spec: + + Drop old and unused pre_checkin.sh for TOUCHSCREEN_OPTIMIZATION + and all conditionals related to it (base_name et al.). + + Fixup compface BuildRequires to only be for non-openSUSE. + + Drop translation-update-upstream BuildRequires and macro. + +------------------------------------------------------------------- Old: ---- pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ balsa.spec ++++++ --- /var/tmp/diff_new_pack.27Hy7q/_old 2018-01-26 13:39:17.865860171 +0100 +++ /var/tmp/diff_new_pack.27Hy7q/_new 2018-01-26 13:39:17.865860171 +0100 @@ -17,8 +17,6 @@ Name: balsa -%define TOUCHSCREEN_OPTIMIZATION %(echo %{name} | grep -qv touchscreen ; echo $?) -%define base_name balsa Version: 2.5.3 Release: 0 Summary: The GNOME Mail Program @@ -28,12 +26,7 @@ Source: http://pawsa.fedorapeople.org/balsa/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM balsa-build-ssl-1.1.patch [email protected] -- Fix build with openssl 1.1.0 Patch: balsa-build-ssl-1.1.patch -%if 0%{?suse_version} == 1320 -# For openSUSE >13.2, compface was split in a devel and library package -BuildRequires: compface -%else -BuildRequires: compface-devel -%endif + BuildRequires: fdupes BuildRequires: gpgme-devel BuildRequires: intltool @@ -41,7 +34,6 @@ BuildRequires: libesmtp-devel BuildRequires: openldap2-devel BuildRequires: openssl-devel -BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(enchant) @@ -57,35 +49,29 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(webkit2gtk-4.0) -Recommends: %{base_name}-lang -%if "%{name}" != "%{base_name}" -Conflicts: %{base_name} -%endif +Recommends: %{name}-lang 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 + +%if !0%{?is_opensuse} +# For openSUSE >13.2, compface was split in a devel and library package +BuildRequires: compface %else -%define BUILD_LANG 0 +BuildRequires: compface-devel %endif %description -Nice GUI program to manage e-mail. +E-mail client for GNOME, highly configurable and incorporating all the features +you would expect in a robust mail client. -%if %BUILD_LANG %lang_package -%endif + %prep -%setup -q -n %{base_name}-%{version} +%setup -q %patch -p1 -translation-update-upstream %build %configure\ -%if %TOUCHSCREEN_OPTIMIZATION - --enable-touch-ui\ -%endif --enable-more-warnings\ --enable-smime\ --with-canberra\ @@ -103,19 +89,12 @@ %install %makeinstall -%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 +%suse_update_desktop_file -G "Mail Client" %{name} +%suse_update_desktop_file -G "Mail Client" %{name}-mailto-handler +%find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_datadir} -%clean -rm -rf %{buildroot} - +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -123,6 +102,7 @@ %postun %desktop_database_postun %icon_theme_cache_postun +%endif %files %defattr(-, root, root) @@ -142,9 +122,7 @@ %dir %{_sysconfdir}/sound/events %config %{_sysconfdir}/sound/events/*.soundlist -%if %BUILD_LANG - -%files lang -f %{base_name}.lang -%endif +%files lang -f %{name}.lang +%defattr(-, root, root) %changelog
