Accepting request 586278 from GNOME:Factory

- Update summaries. Limit fdupes to /usr. (forwarded request 586271 from jengelh)

OBS-URL: https://build.opensuse.org/request/show/586278
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=208

evolution-3.26.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37d4f2cd029390fe81edbf82854125a934865ecc17076959915346555c81b8a9
-size 12036120

evolution-3.28.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce0a7a4da646bdf7692dcece1b0facb1473368ae53a1d3ee45cc35498ce1de2c
+size 12107500

evolution.spec

@@ -18,23 +18,21 @@
 
 # wait for port of gtkimageview to gtk3
 %define use_gtkimageview 0
-
 %define need_autogen 0
-
-Name:           evolution
 # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
-%define evolution_base_version 3.26
+%define evolution_base_version 3.28
-Version:        3.26.6
-Release:        0
 # _version needs to be %{version} stripped to major.minor.micro only...
 %define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
+Name:           evolution
+Version:        3.28.0
+Release:        0
 # FIXME: check if note on license is still valid (comment before license)
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 # NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
 License:        LGPL-2.0-only AND LGPL-3.0-only
 Group:          Productivity/Networking/Email/Clients
 Url:            http://wiki.gnome.org/Apps/Evolution/
-Source0:        http://download.gnome.org/sources/evolution/3.26/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/evolution/%{evolution_base_version}/%{name}-%{version}.tar.xz
 # The icon we rely on is from adwaita-icon-theme
 BuildRequires:  adwaita-icon-theme
 BuildRequires:  bison
@@ -43,21 +41,16 @@ BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
-BuildRequires:  openldap2-devel
-%if %{need_autogen}
-BuildRequires:  gnome-common
-%endif
 BuildRequires:  gtk-doc
 BuildRequires:  highlight
 BuildRequires:  intltool
+BuildRequires:  openldap2-devel
+BuildRequires:  pkgconfig
 # don't you ever enable this! It's experimental and insecure (bnc#609013)
 #BuildRequires:  libytnef-devel
 BuildRequires:  psmisc
 BuildRequires:  spamassassin
 BuildRequires:  sqlite3-devel
-%if !0%{?is_opensuse}
-BuildRequires:  translation-update-upstream
-%endif
 BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(atk)
@@ -72,10 +65,6 @@ BuildRequires:  pkgconfig(gnome-autoar-gtk-0) >= 0.1.1
 BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 2.91.3
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.8.0
 BuildRequires:  pkgconfig(gtkspell3-3.0)
-BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.13.90
-%if %{use_gtkimageview}
-BuildRequires:  pkgconfig(gtkimageview-3.0)
-%endif
 BuildRequires:  pkgconfig(gweather-3.0) >= 3.10
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(libcanberra-gtk3)
@@ -90,13 +79,22 @@ BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(pangoft2)
 BuildRequires:  pkgconfig(shared-mime-info) >= 0.22
 BuildRequires:  pkgconfig(sm)
+BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.13.90
 Requires:       evolution-data-server >= %{_version}
 Recommends:     %{name}-lang
 # Mono and python plugins were available until evo 3.5.x
 Obsoletes:      evolution-mono-plugins < %{version}
 Obsoletes:      evolution-python-plugins < %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %glib2_gsettings_schema_requires
+%if %{need_autogen}
+BuildRequires:  gnome-common
+%endif
+%if !0%{?is_opensuse}
+BuildRequires:  translation-update-upstream
+%endif
+%if %{use_gtkimageview}
+BuildRequires:  pkgconfig(gtkimageview-3.0)
+%endif
 
 %description
 Evolution consists of modular components (at the moment: mailer,
@@ -105,7 +103,7 @@ of the modular design, it is possible to plug new components into
 Evolution or embed the existing ones in other applications.
 
 %package -n glade-catalog-evolution
-Summary:        Evolution Library -- Catalog for Glade
+Summary:        Glade catalog for the Evolution groupware library
 Group:          Development/Tools/GUI Builders
 Requires:       %{name} = %{version}
 Requires:       glade
@@ -121,18 +119,18 @@ This package provides a catalog for Glade, to allow the use of Evolution
 widgets in Glade.
 
 %package -n evolution-plugin-bogofilter
-Summary:        Evolution extension -- bogofilter
+Summary:        bogofilter plugin for the Evolution groupware suite
 Group:          Productivity/Networking/Email/Clients
 Requires:       %{name}
 Requires:       bogofilter
-Supplements:    packageand(%{name}:bogofilter)
 Enhances:       %{name}
+Supplements:    packageand(%{name}:bogofilter)
 
 %description -n evolution-plugin-bogofilter
 Adds support for junk-mail filtering via bogofilter.
 
 %package -n evolution-plugin-pst-import
-Summary:        Evolution extension -- Outlook PST Import
+Summary:        Outlook PST importer plugin for the Evolution groupware suite
 Group:          Productivity/Networking/Email/Clients
 Requires:       %{name}
 Enhances:       %{name}
@@ -141,18 +139,18 @@ Enhances:       %{name}
 Adds support to import messages from Outlook PST files.
 
 %package -n evolution-plugin-spamassassin
-Summary:        Evolution extension -- spamassassin
+Summary:        SpamAssassin plugin for the Evolution groupware suite
 Group:          Productivity/Networking/Email/Clients
 Requires:       %{name}
 Requires:       spamassassin
-Supplements:    packageand(%{name}:spamassassin)
 Enhances:       %{name}
+Supplements:    packageand(%{name}:spamassassin)
 
 %description -n evolution-plugin-spamassassin
 Adds support for junk-mail filtering via spamassassin.
 
 %package devel
-Summary:        Include Files and Libraries mandatory for Development
+Summary:        Development files for the Evolution groupware suite
 Group:          Development/Libraries/C and C++
 Requires:       evolution = %{version}
 Provides:       evolution2-devel = %{version}
@@ -163,6 +161,7 @@ This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
 %lang_package
+
 %prep
 %setup -q
 %if !0%{?is_opensuse}
@@ -177,33 +176,27 @@ translation-update-upstream
   -DENABLE_GTK_DOC=ON \
   -DCMAKE_SKIP_RPATH=OFF \
 %if !%{use_gtkimageview}
-  %nil
+  %{nil}
 %endif
-  %nil
+  %{nil}
-make %{?_smp_flags}
+make %{?_smp_mflags}
 
 %install
 %cmake_install
-# Office is okay upstream, but we want the menu item to appear in Internet
+%suse_update_desktop_file -r -G "Mail and Calendar" org.gnome.Evolution GNOME GTK Network Email Calendar ContactManagement
-grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.desktop
+%suse_update_desktop_file org.gnome.Evolution-alarm-notify
-%suse_update_desktop_file -r -G "Mail and Calendar" evolution GNOME GTK Network Email Calendar ContactManagement
+%find_lang %{name} %{?no_lang_C}
-%suse_update_desktop_file evolution-alarm-notify
-%find_lang evolution %{?no_lang_C}
 #%%find_lang evolution %%{?no_lang_C} evolution-%%evolution_base_version.lang
-%fdupes %{buildroot}
+%fdupes %{buildroot}/%{_prefix}
 
 %files
-%defattr(-,root,root)
+%license COPYING
-%doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 COPYING-DOCS COPYING.OPENLDAP ChangeLog MAINTAINERS NEWS NEWS-1.0 README
+%doc AUTHORS COPYING-DOCS COPYING-DOCS.CCBYSA COPYING-DOCS.GFDL NEWS NEWS-1.0
 %doc %{_datadir}/help/C/%{name}/
 %{_bindir}/*
 %{_datadir}/GConf/gsettings/evolution.convert
-%dir %{_datadir}/appdata
-%{_datadir}/appdata/evolution.appdata.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/evolution
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/icons/hicolor/*/apps/evolution-symbolic.svg
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml
@@ -212,6 +205,9 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 # despite the plugins being split in their own packages, the schema must be present in any case
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/*/apps/evolution-symbolic.svg
+%{_datadir}/metainfo/org.gnome.Evolution.appdata.xml
 %dir %{_libdir}/evolution/
 %{_libdir}/evolution/*.so
 %dir %{_libdir}/evolution/modules
@@ -289,37 +285,33 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_libdir}/evolution/web-extensions/module-itip-formatter-webextension.so
 %dir %{_libdir}/evolution/web-extensions/webkit-editor
 %{_libdir}/evolution/web-extensions/webkit-editor/module-webkit-editor-webextension.so
-%{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop
+%{_sysconfdir}/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop
 
 %files lang -f evolution.lang
 
 %files -n glade-catalog-evolution
-%defattr(-,root,root)
 %{_libdir}/glade/modules/libgladeevolution.so
 %{_datadir}/glade/catalogs/evolution.xml
 
 %files -n evolution-plugin-bogofilter
-%defattr(-,root,root)
+%{_datadir}/metainfo/org.gnome.Evolution-bogofilter.metainfo.xml
-%{_datadir}/appdata/evolution-bogofilter.metainfo.xml
 %{_libdir}/evolution/modules/module-bogofilter.so
 
 %files -n evolution-plugin-spamassassin
-%defattr(-,root,root)
+%{_datadir}/metainfo/org.gnome.Evolution-spamassassin.metainfo.xml
-%{_datadir}/appdata/evolution-spamassassin.metainfo.xml
 %{_libdir}/evolution/modules/module-spamassassin.so
 
 %files -n evolution-plugin-pst-import
-%defattr(-,root,root)
 %{_libdir}/evolution/plugins/*-pst-import.*
-%{_datadir}/appdata/evolution-pst.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Evolution-pst.metainfo.xml
 
 %files devel
-%defattr(-,root,root)
+%doc ChangeLog HACKING MAINTAINERS README
+%doc %{_datadir}/gtk-doc/html/evolution-*/
 %{_includedir}/evolution*
 %{_libdir}/pkgconfig/evolution-calendar-3.0.pc
 %{_libdir}/pkgconfig/evolution-mail-3.0.pc
 %{_libdir}/pkgconfig/evolution-shell-3.0.pc
 %{_libdir}/pkgconfig/libemail-engine.pc
-%{_datadir}/gtk-doc/html/evolution-*/
 
 %changelog