[lpf-flash-plugin] Update to 28.0.0.161
by Sérgio M. Basto
commit c49fc4024f7f3617d94d3dd379abb45248898328
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Feb 15 01:43:48 2018 +0000
Update to 28.0.0.161
check_new_version.py | 2 +-
flash-plugin.spec.in | 5 ++++-
lpf-flash-plugin.spec | 5 ++++-
3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/check_new_version.py b/check_new_version.py
index a54b58b..469d204 100755
--- a/check_new_version.py
+++ b/check_new_version.py
@@ -43,7 +43,7 @@ if new_version != old_version:
if runme(pkgcmd, enviro):
print('error running runme')
- print('rfpkg clog && rfpkg commit -F clog && /bin/rm clog && git show')
+ print('rfpkg ci -c && git show')
print('rfpkg push && rfpkg build --nowait')
print('git checkout f27 && git merge master && git push && rfpkg build --nowait; git checkout master')
print('git checkout f26 && git merge master && git push && rfpkg build --nowait; git checkout master')
diff --git a/flash-plugin.spec.in b/flash-plugin.spec.in
index cec1052..abd88c4 100644
--- a/flash-plugin.spec.in
+++ b/flash-plugin.spec.in
@@ -2,7 +2,7 @@
%global __strip /bin/true
Name: flash-plugin
-Version: 28.0.0.137
+Version: 28.0.0.161
Release: 1%{?dist}
Epoch: 1
Summary: Adobe Flash Player
@@ -75,6 +75,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/*/apps/flash-player-properties.png
%changelog
+* Thu Feb 15 2018 Sérgio Basto <sergio(a)serjux.com> - 1:28.0.0.161-1
+- Update to 28.0.0.161
+
* Tue Jan 16 2018 Sérgio Basto <sergio(a)serjux.com> - 1:28.0.0.137-1
- Update to 28.0.0.137
diff --git a/lpf-flash-plugin.spec b/lpf-flash-plugin.spec
index 0314590..d6af3e9 100644
--- a/lpf-flash-plugin.spec
+++ b/lpf-flash-plugin.spec
@@ -5,7 +5,7 @@
%define target_pkg %(t=%{name}; echo ${t#lpf-})
Name: lpf-flash-plugin
-Version: 28.0.0.137
+Version: 28.0.0.161
Release: 1%{?dist}
Epoch: 1
Summary: Adobe Flash Player package bootstrap
@@ -67,6 +67,9 @@ fi
%changelog
+* Thu Feb 15 2018 Sérgio Basto <sergio(a)serjux.com> - 1:28.0.0.161-1
+- Update to 28.0.0.161
+
* Tue Jan 16 2018 Sérgio Basto <sergio(a)serjux.com> - 1:28.0.0.137-1
- Update to 28.0.0.137
6 years, 7 months
[wl-kmod] Add patch for kernel >= 4.15 - fix timer issue - rfbz#4798
by Nicolas Viéville
commit 022d8784510b2c9af33147d8d9c2ee42d06e8310
Author: Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr>
Date: Thu Feb 15 01:29:31 2018 +0100
Add patch for kernel >= 4.15 - fix timer issue - rfbz#4798
wl-kmod-012_kernel_4.15_new_timer.patch | 47 +++++++++++++++++++++++++++++++++
wl-kmod.spec | 7 ++++-
2 files changed, 53 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod-012_kernel_4.15_new_timer.patch b/wl-kmod-012_kernel_4.15_new_timer.patch
new file mode 100644
index 0000000..533e7b4
--- /dev/null
+++ b/wl-kmod-012_kernel_4.15_new_timer.patch
@@ -0,0 +1,47 @@
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c 2017-06-03 15:26:57.094475000 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2018-02-15 00:54:30.184690464 +0100
+@@ -93,7 +93,11 @@
+
+ #include <wlc_wowl.h>
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static void wl_timer(struct timer_list *tl);
++#else
+ static void wl_timer(ulong data);
++#endif
+ static void _wl_timer(wl_timer_t *t);
+ static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
+
+@@ -2311,10 +2315,17 @@
+ atomic_dec(&t->wl->callbacks);
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static void
++wl_timer(struct timer_list *tl)
++{
++ wl_timer_t *t = (wl_timer_t *)tl;
++#else
+ static void
+ wl_timer(ulong data)
+ {
+ wl_timer_t *t = (wl_timer_t *)data;
++#endif
+
+ if (!WL_ALL_PASSIVE_ENAB(t->wl))
+ _wl_timer(t);
+@@ -2366,9 +2377,13 @@
+
+ bzero(t, sizeof(wl_timer_t));
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++ timer_setup(&t->timer, wl_timer, 0);
++#else
+ init_timer(&t->timer);
+ t->timer.data = (ulong) t;
+ t->timer.function = wl_timer;
++#endif
+ t->wl = wl;
+ t->fn = fn;
+ t->arg = arg;
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 0fc636a..40a0e7d 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -8,7 +8,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -27,6 +27,7 @@ Patch7: wl-kmod-008_fix_kernel_warnings.patch
Patch8: wl-kmod-009_kernel_4.11_remove_last_rx_in_net_device_struct.patch
Patch9: wl-kmod-010_kernel_4.12_add_cfg80211_roam_info_struct.patch
Patch10: wl-kmod-011_kernel_4.14_new_kernel_read_function_prototype.patch
+Patch11: wl-kmod-012_kernel_4.15_new_timer.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -78,6 +79,7 @@ pushd %{name}-%{version}-src
%patch8 -p1 -b .kernel_4.11_remove_last_rx_in_net_device_struct
%patch9 -p1 -b .kernel_4.12_add_cfg80211_roam_info_struct
%patch10 -p1 -b .kernel_4.14_new_kernel_read_function_prototype
+%patch11 -p1 -b .kernel_4.15_new_timer
popd
for kernel_version in %{?kernel_versions} ; do
@@ -107,6 +109,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Feb 15 2018 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-16
+- Add patch for kernel >= 4.15 - fix timer issue - rfbz#4798
+
* Wed Nov 29 2017 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-15
- Add patch for kernel >= 4.14 from Olaf Hering - thanks to Tim Thomas
6 years, 7 months
[clipgrab/f26] Update to 3.6.7
by Sérgio M. Basto
Summary of changes:
e35c8dd... Update to 3.6.7 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[clipgrab/f27] Update to 3.6.7
by Sérgio M. Basto
Summary of changes:
e35c8dd... Update to 3.6.7 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[clipgrab] Update to 3.6.7
by Sérgio M. Basto
commit e35c8ddf18a32688bfc57b0549046d318e0b5a48
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Feb 14 17:45:02 2018 +0000
Update to 3.6.7
.gitignore | 1 +
clipgrab.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e19f302..02a7c58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ clipgrab-3.5.5.tar.gz
/clipgrab-3.6.4.tar.gz
/clipgrab-3.6.5.tar.gz
/clipgrab-3.6.6.tar.gz
+/clipgrab-3.6.7.tar.gz
diff --git a/clipgrab.spec b/clipgrab.spec
index 998c34e..f1a389c 100644
--- a/clipgrab.spec
+++ b/clipgrab.spec
@@ -1,5 +1,5 @@
Name: clipgrab
-Version: 3.6.6
+Version: 3.6.7
Release: 1%{?dist}
License: GPLv3 and Non-Commercial Use Only (Artwork and Trademark)
@@ -49,6 +49,9 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
%changelog
+* Wed Feb 14 2018 Sérgio Basto <sergio(a)serjux.com> - 3.6.7-1
+- Update to 3.6.7
+
* Sat Oct 14 2017 Sérgio Basto <sergio(a)serjux.com> - 3.6.6-1
- Update clipgrab to 3.6.6
diff --git a/sources b/sources
index dbb038e..d3205f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-141a78f0eb0a19241376987ae8c7522f clipgrab-3.6.6.tar.gz
+b26201f062bbbd22d37629d94804ba06 clipgrab-3.6.7.tar.gz
6 years, 7 months
[kaffeine] Use ninja to build
by Leigh Scott
commit 082e51dbba7e20cf87c943de5e945770d5c654f6
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Feb 14 01:32:17 2018 +0000
Use ninja to build
kaffeine.spec | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
---
diff --git a/kaffeine.spec b/kaffeine.spec
index 4c176b7..c0a1406 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 2.0.14
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -16,6 +16,7 @@ Source0: https://download.kde.org/%{stable}/%{name}/%{name}-%{version}.tar.xz
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: gettext
+BuildRequires: ninja-build
BuildRequires: extra-cmake-modules
BuildRequires: cmake(Qt5X11Extras)
BuildRequires: cmake(KF5CoreAddons)
@@ -51,14 +52,14 @@ rm -rf po/pt_BR
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{cmake_kf5} ..
+%{cmake_kf5} -GNinja ..
popd
-%make_build -C %{_target_platform}
+%ninja_build -C %{_target_platform}
%install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%ninja_install -C %{_target_platform}
%find_lang %{name} --with-qt --with-man --all-name
@@ -71,21 +72,6 @@ appstream-util validate-relax --nonet %{buildroot}/%{_kf5_datadir}/metainfo/org.
appstream-util validate-relax --nonet %{buildroot}/%{_kf5_datadir}/appdata/org.kde.kaffeine.appdata.xml
%endif
-
-%post
-/bin/touch --no-create %{_kf5_datadir}/icons/hicolor &>/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_kf5_datadir}/icons/hicolor &>/dev/null || :
- /usr/bin/gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &>/dev/null || :
-
-
%files -f %{name}.lang
%doc README.md
%license COPYING COPYING-DOCS
@@ -104,6 +90,10 @@ fi
%{_kf5_mandir}/man1/kaffeine.1.*
%changelog
+* Wed Feb 14 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-3
+- Use ninja to build
+- Remove scriptlets
+
* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-2
- remove broken pt_BR locale
- fix appdata install
6 years, 7 months