[evolution-mapi] Revert "Adapt to rename of evolution.desktop to org.gnome.Evolution.desktop"

[Milan Crha <mcrha src gnome org>]

commit 59b7f36cec0d6e88903b7bfecf2af2f01fe46cf8
Author: Milan Crha <mcrha redhat com>
Date:   Mon Sep 4 17:08:33 2017 +0200

    Revert "Adapt to rename of evolution.desktop to org.gnome.Evolution.desktop"
    
    This reverts commit 8e5bdd5ea8c8a20d4e3f164698af063f8b241db0.

 CMakeLists.txt                                     |    2 +-
 cmake/modules/FindIntltool.cmake                   |    2 +-
 ...tainfo.xml.in => evolution-mapi.metainfo.xml.in |    2 +-
 po/POTFILES.in                                     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c28774c..48400ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,7 +202,7 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/${PROJECT_NAM
 
 print_build_options()
 
-add_appdata_file(org.gnome.Evolution-mapi.metainfo.xml.in org.gnome.Evolution-mapi.metainfo.xml)
+add_appdata_file(evolution-mapi.metainfo.xml.in evolution-mapi.metainfo.xml)
 
 add_subdirectory(po)
 add_subdirectory(src)
diff --git a/cmake/modules/FindIntltool.cmake b/cmake/modules/FindIntltool.cmake
index 1397b6d..a2c3547 100644
--- a/cmake/modules/FindIntltool.cmake
+++ b/cmake/modules/FindIntltool.cmake
@@ -189,7 +189,7 @@ macro(add_appdata_file _infilename _outfilename)
        endif(NOT TARGET appdata-files)
 
        set(_out ${_outfilename})
-       get_filename_component(_outtarget ${_out} NAME)
+       get_filename_component(_outtarget ${_out} NAME_WE)
        get_filename_component(_path ${_out} DIRECTORY)
        if(_path STREQUAL "")
                set(_out ${CMAKE_CURRENT_BINARY_DIR}/${_out})
diff --git a/org.gnome.Evolution-mapi.metainfo.xml.in b/evolution-mapi.metainfo.xml.in
similarity index 92%
rename from org.gnome.Evolution-mapi.metainfo.xml.in
rename to evolution-mapi.metainfo.xml.in
index 2f6d09b..9b6f85b 100644
--- a/org.gnome.Evolution-mapi.metainfo.xml.in
+++ b/evolution-mapi.metainfo.xml.in
@@ -2,7 +2,7 @@
 <!-- Copyright 2014 Evolution Team <evolution-hackers gnome org> -->
 <component type="addon">
        <id>evolution-mapi</id>
-       <extends>org.gnome.Evolution.desktop</extends>
+       <extends>evolution.desktop</extends>
        <_name>Exchange MAPI</_name>
        <_summary>For accessing Microsoft Exchange 2007/OpenChange servers via MAPI
        </_summary>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fb4a167..cfdcdd9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
-org.gnome.Evolution-mapi.metainfo.xml.in
+evolution-mapi.metainfo.xml.in
 src/addressbook/e-book-backend-mapi.c
 src/addressbook/e-book-backend-mapi-contacts.c
 src/addressbook/e-book-backend-mapi-gal.c