From 324ea25ad46d2d07fe2d2345ea838ed7a496cf0a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 2 Oct 2018 14:58:54 +0200 Subject: [PATCH] update to version 2.1.1 --- .gitignore | 3 +++ 01-fix-linker-flags.patch | 13 ------------- sources | 2 +- wingpanel-indicator-datetime.spec | 25 +++++++++---------------- 4 files changed, 13 insertions(+), 30 deletions(-) delete mode 100644 01-fix-linker-flags.patch diff --git a/.gitignore b/.gitignore index 0835c68..4c08dcd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/results* +/*.src.rpm /wingpanel-indicator-datetime-2.0.1.tar.xz /wingpanel-indicator-datetime-2.0.2.tar.gz /wingpanel-indicator-datetime-2.1.0.tar.gz +/wingpanel-indicator-datetime-2.1.1.tar.gz diff --git a/01-fix-linker-flags.patch b/01-fix-linker-flags.patch deleted file mode 100644 index 52c8bb4..0000000 --- a/01-fix-linker-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 80eb477..e7ae0a1 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -44,7 +44,7 @@ OPTIONS - ) - - add_library (${CMAKE_PROJECT_NAME} MODULE ${VALA_C}) --target_link_libraries(${CMAKE_PROJECT_NAME} ${DEPS_LIBRARIES}) -+target_link_libraries(${CMAKE_PROJECT_NAME} ${DEPS_LIBRARIES} m) - - # Installation - install (TARGETS ${CMAKE_PROJECT_NAME} DESTINATION ${PKGDATADIR}) diff --git a/sources b/sources index a4c23de..10376b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.1.0.tar.gz) = cfa20e16148fcdd2d63a52c79ec9344fd30e33a015d4d7377f2304c0bac7749d807fb681c092f8ae26779d7636f5b9c7d780822af916c640e657cbde99ea6a60 +SHA512 (wingpanel-indicator-datetime-2.1.1.tar.gz) = 8ccabeef520ef57549c680694233350da511cadc3f2912ba3439bc2df3f053001711f25bde6f9ac99cae5f6b5525da25d6de7faaa3ac57900b0310e7425ded53 diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index d97ba1a..7646906 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -4,20 +4,15 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.1.0 -Release: 3%{?dist} +Version: 2.1.1 +Release: 1%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# Patch to fix undefined symbols -Patch1: 01-fix-linker-flags.patch - -BuildRequires: cmake -BuildRequires: gcc -BuildRequires: gcc-c++ BuildRequires: gettext +BuildRequires: meson BuildRequires: vala >= 0.22.0 BuildRequires: pkgconfig(glib-2.0) >= 2.32 @@ -26,7 +21,6 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libecal-1.2) BuildRequires: pkgconfig(libedataserver-1.2) BuildRequires: pkgconfig(libical) -BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(wingpanel-2.0) Requires: wingpanel%{?_isa} @@ -42,16 +36,12 @@ A datetime indicator for wingpanel. %build -mkdir build && pushd build -%cmake .. -%make_build -popd +%meson +%meson_build %install -pushd build -%make_install -popd +%meson_install %find_lang datetime-indicator @@ -66,6 +56,9 @@ popd %changelog +* Tue Oct 02 2018 Fabio Valentini - 2.1.1-1 +- Update to version 2.1.1. + * Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild