R1: update to version 2.0.4

.gitignore

@@ -1 +1,6 @@
 /wingpanel-2.0.1.tar.xz
+/wingpanel-2.0.2.tar.xz
+/wingpanel-2.0.3.tar.gz
+/wingpanel-2.0.3-7a1a583.tar.gz
+/wingpanel-2.0.3-434f674.tar.gz
+/wingpanel-2.0.4.tar.gz

01-mutter-3-22-support.patch

@@ -1,45 +0,0 @@
-=== modified file 'CMakeLists.txt'
---- CMakeLists.txt	2016-11-06 21:16:43 +0000
-+++ CMakeLists.txt	2016-11-17 14:55:38 +0000
-@@ -110,7 +110,6 @@
- 
- set (DEPS_PKG
-   granite
--  gala
- )
- 
- pkg_check_modules (DEPS REQUIRED ${DEPS_PKG} ${LIB_PKG})
-
-=== modified file 'wingpanel-interface/CMakeLists.txt'
---- wingpanel-interface/CMakeLists.txt	2016-05-06 15:52:18 +0000
-+++ wingpanel-interface/CMakeLists.txt	2016-11-17 14:55:38 +0000
-@@ -1,9 +1,9 @@
- find_package (PkgConfig)
- 
--pkg_check_modules (DEPS REQUIRED gala granite)
-+pkg_check_modules (PLUGIN REQUIRED gala granite)
- 
--add_definitions (${DEPS_CFLAGS})
--link_directories (${DEPS_LIBRARY_DIRS})
-+add_definitions (${PLUGIN_CFLAGS})
-+link_directories (${PLUGIN_LIBRARY_DIRS})
- set (WINGPANELINTERFACE "wingpanel-interface")
- 
- find_package (Vala REQUIRED)
-@@ -28,7 +28,14 @@
- )
- 
- add_library (${WINGPANELINTERFACE} MODULE ${VALA_C})
--target_link_libraries(${WINGPANELINTERFACE} ${DEPS_LIBRARIES})
-+target_link_libraries(${WINGPANELINTERFACE} ${PLUGIN_LIBRARIES})
-+
-+# Add -rpath ldflag if libgala is using mutter >= 3.21 to pick up libmutter-*.so
-+pkg_check_modules(MUTTER322 QUIET libmutter>=3.21)
-+if (MUTTER322_FOUND)
-+  _pkgconfig_invoke("libmutter" MUTTER TYPELIB_DIR "" "--variable=typelibdir")
-+  set_target_properties(${WINGPANELINTERFACE} PROPERTIES LINK_FLAGS -Wl,-rpath,${MUTTER_TYPELIB_DIR})
-+endif ()
- 
- include (GNUInstallDirs)
- install (TARGETS ${WINGPANELINTERFACE} DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/gala/plugins")
-

02-fix-pkgconfig.patch

@@ -1,12 +0,0 @@
-diff -Naur a/lib/wingpanel.pc.cmake b/lib/wingpanel.pc.cmake
---- a/lib/wingpanel.pc.cmake	2016-08-13 17:36:46.000000000 +0200
-+++ b/lib/wingpanel.pc.cmake	2017-01-11 22:00:30.081004463 +0100
-@@ -1,7 +1,7 @@
- prefix=@PREFIX@
- exec_prefix=@DOLLAR@{prefix}
- libdir=@DOLLAR@{prefix}/lib
--includedir=@DOLLAR@{prefix}/include/
-+includedir=@DOLLAR@{prefix}/include
-  
- Name: Wingpanel
- Description: Wingpanel headers  

sources

@@ -1 +1 @@
-SHA512 (wingpanel-2.0.1.tar.xz) = 1b36663c7a78dfaf8c6c9cbd8ef32e3e7406fff77f6450eece63b78f01cdde57265c200bd42738dba9ae686d5fc0c5b963c92a3467d42afa672a054824d5a9fa
+SHA512 (wingpanel-2.0.4.tar.gz) = a9d4a53f97ed8f29cb00db9f5d970278329a741bb7d52f57850ef1f090b61e7c2b92c7b842d296d77580921a975494a6c11710d476f9b6e7ae4bc74c50b349dc

wingpanel.spec

@@ -1,15 +1,11 @@
 Name:           wingpanel
 Summary:        Stylish top panel
-Version:        2.0.1
-Release:        10%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 License:        GPLv2+
-URL:            https://launchpad.net/wingpanel
 
-Source0:        https://launchpad.net/%{name}/2.x/%{version}/+download/%{name}-%{version}.tar.xz
-
-# This is a fix for a crash with mutter 3.22+, taken from upstream
-Patch0:         01-mutter-3-22-support.patch
-Patch1:         02-fix-pkgconfig.patch
+URL:            https://github.com/elementary/%{name}
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -21,25 +17,20 @@ BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.40
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.14
 BuildRequires:  pkgconfig(granite)
-BuildRequires:  pkgconfig(libnotify)
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 
 %description
 Stylish top panel that holds indicators and spawns an application
-launcher
-
-Designed for elementary OS.
+launcher.
 
 
 %package        libs
 Summary:        Stylish top panel (shared library)
 %description    libs
 Stylish top panel that holds indicators and spawns an application
-launcher
-
-Designed for elementary OS.
+launcher.
 
 This package contains the shared library.
 
@@ -49,17 +40,13 @@ Summary:        Stylish top panel (development files)
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 %description    devel
 Stylish top panel that holds indicators and spawns an application
-launcher
-
-Designed for elementary OS.
+launcher.
 
 This package contains the files required for developing for wingpanel.
 
 
 %prep
-%setup -q
-%patch0 -p0
-%patch1 -p1
+%autosetup
 
 
 %build
@@ -79,16 +66,30 @@ popd
 # create plugin directory
 mkdir -p %{buildroot}/%{_libdir}/wingpanel
 
-# force correct file mode for COPYING ...
-chmod 644 COPYING
+# create settings directory
+mkdir -p %{buildroot}/%{_sysconfdir}/wingpanel.d
 
 
 %check
-desktop-file-validate %{buildroot}/%{_datadir}/applications/wingpanel.desktop
+desktop-file-validate \
+    %{buildroot}/%{_datadir}/applications/wingpanel.desktop
 
 
-%post           libs -p /sbin/ldconfig
-%postun         libs -p /sbin/ldconfig
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 
 %files -f wingpanel.lang
@@ -98,18 +99,20 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/wingpanel.desktop
 
 %{_datadir}/applications/wingpanel.desktop
 %{_datadir}/glib-2.0/schemas/org.pantheon.desktop.wingpanel.gschema.xml
+%{_datadir}/icons/hicolor/scalable/apps/wingpanel.svg
 
 
-%files          libs
+%files libs
 %license COPYING
 
+%dir %{_sysconfdir}/wingpanel.d
 %dir %{_libdir}/wingpanel
 
 %{_libdir}/libwingpanel-2.0.so.0
 %{_libdir}/libwingpanel-2.0.so.0.2.0
 
 
-%files          devel
+%files devel
 %{_includedir}/wingpanel-2.0/
 
 %{_libdir}/libwingpanel-2.0.so
@@ -120,6 +123,19 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/wingpanel.desktop
 
 
 %changelog
+* Wed Sep 13 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.4-1
+- Update to version 2.0.4.
+
+* Tue May 30 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.3-1
+- Update to version 2.0.3.
+
+* Sat Apr 08 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.2-2
+- Create and own missing settings directory.
+
+* Fri Mar 17 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.2-1
+- Update to version 2.0.2.
+- Remove upstreamed patches.
+
 * Wed Jan 11 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.1-10
 - Add patch to fix pkgconfig file.