diff --git a/.gitignore b/.gitignore index e05d0dc..f6d4e24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cairo-dock-plugins-fedora-3.4.0.tar.gz /cairo-dock-plugins-fedora-3.4.1.tar.gz /cairo-dock-plugins-fedora-3.4.1-20201022gita0d3415.tar.gz +/cairo-dock-plugins-fedora-3.4.1-20210103git8554994.tar.gz diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 852361f..6b2fc10 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,12 +4,12 @@ %global core_least_ver 3.4.1 %global use_git 1 -%global gitdate 20201022 -%global githash a0d3415c234158e08785a7e7624f79a43918f07d +%global gitdate 20210103 +%global githash 85549944506fd2e854fd3e4000bfe935b1315558 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global mainrel 38 +%global mainrel 39 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -40,9 +40,6 @@ Source0: cairo-dock-plugins-fedora-%{tarballver}.tar.gz Source1: cairo-dock-plug-ins-create-fedora-tarball.sh # Port to WebKit2 Patch11: cairo-dock-plugins-3.4.1-port-WebKit2.patch -# https://github.com/Cairo-Dock/cairo-dock-plug-ins/pull/10 -# Fix for macro in weather plugin to modify unresolved symbol -Patch12: cairo-dock-plugins-3.4.1-gita0d3415-weather-macro.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -80,7 +77,7 @@ BuildRequires: lm_sensors-devel BuildRequires: python3-devel BuildRequires: ruby-devel BuildRequires: vala -BuildRequires: make +BuildRequires: make Requires: %{name}-base%{?_isa} = %{version}-%{release} # Explicitly write below @@ -205,7 +202,6 @@ binding for Cairo-Dock. %setup -q -n cairo-dock-plugins-%{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %if 0%{?use_webkit2} %patch11 -p1 -b .wk2 -%patch12 -p1 -b .macro %endif ## permission @@ -419,6 +415,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Thu Jan 7 2021 Mamoru TASAKA - 3.4.1-39.20210103git8554994 +- Update to the latest git + * Sun Jan 3 2021 Mamoru TASAKA - 3.4.1-38.20201022gita0d3415 - Update to the latest git diff --git a/cairo-dock-plugins-3.4.1-gita0d3415-weather-macro.patch b/cairo-dock-plugins-3.4.1-gita0d3415-weather-macro.patch deleted file mode 100644 index 8b1c11a..0000000 --- a/cairo-dock-plugins-3.4.1-gita0d3415-weather-macro.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- cairo-dock-plugins-3.4.1-20201022gita0d3415/weather/src/applet-config.c.macro 2020-10-22 00:04:44.000000000 +0900 -+++ cairo-dock-plugins-3.4.1-20201022gita0d3415/weather/src/applet-config.c 2021-01-02 22:39:22.227930480 +0900 -@@ -61,7 +61,9 @@ - - cd_weather_reset_data (myApplet); - -+#ifdef CD_WEATHER_HAS_CODE_LOCATION - cd_weather_free_location_list (); -+#endif - - CD_APPLET_DELETE_MY_ICONS_LIST; - diff --git a/sources b/sources index bb58ba0..9d6b767 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.4.1-20201022gita0d3415.tar.gz) = 40038d31ad9bf60ab5ee9b05f0f34a2fffa995bac205be28fd4c978358806d3d708ed2ca52b687e64a1b94f127b7fb70b7c75d8223661f565ef4d3e6081e9bc7 +SHA512 (cairo-dock-plugins-fedora-3.4.1-20210103git8554994.tar.gz) = 6f34e6e258a89aacd18fef8f1b434ad9c7592e5fc50c0e9a134a19a3298cc0de8c1a22639a3c25417648259873cc88d567430cec7b049a008d3a05c805105085