[broadcom-wl] Added AppStream Metadata Update new Broadcom upstream URLs in SPEC file Cleanup and rework SPEC file
by Nicolas Viéville
commit 2fa1df0b909008aef9f7628b51493c2213653fe4
Author: Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr>
Date: Thu Apr 19 21:22:32 2018 +0200
Added AppStream Metadata
Update new Broadcom upstream URLs in SPEC file
Cleanup and rework SPEC file for RHEL 6.x and 7.x
.gitignore | 1 +
broadcom-wl.spec | 90 +++++++++++++++++-------
com.broadcom.wireless.hybrid.driver.metainfo.xml | 51 ++++++++++++++
generate-modalias-metadata.py | 74 +++++++++++++++++++
sources | 2 +-
5 files changed, 190 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 14cdcea..6d9665f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz
hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz
README_6.30.223.271.txt
+/broadcom-wl-blacklist.conf
diff --git a/broadcom-wl.spec b/broadcom-wl.spec
index c1bb676..b8664aa 100644
--- a/broadcom-wl.spec
+++ b/broadcom-wl.spec
@@ -1,29 +1,48 @@
+%if 0%{?rhel} > 6 || 0%{?fedora}
+ # The common usage uses /usr directory, even if it's not conforming to
+ # Fedora Packaging Guidelines, as well kmod and dracut packages, see:
+ # https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelin...
+ %global _modprobe_d %{_prefix}/lib/modprobe.d
+ %global _dracut_conf_d %{_prefix}/lib/dracut/dracut.conf.d
+%else #rhel <= 6
+ %global _modprobe_d %{_sysconfdir}/modprobe.d
+ %global _dracut_conf_d %{_sysconfdir}/dracut.conf.d
+%endif
+
Name: broadcom-wl
Version: 6.30.223.271
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
-URL: https://www.broadcom.com/support/?gid=1
-Source0: https://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223...
-Source1: https://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_...
-Source2: https://www.broadcom.com/docs/linux_sta/README_6.30.223.271.txt
+URL: https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrast...
+Source0: https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-no...
+Source1: https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64...
+Source2: https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.2...
Source3: broadcom-wl-blacklist.conf
Source4: 20-wl.conf
Source5: api
Source6: fedora.readme
+Source7: com.broadcom.wireless.hybrid.driver.metainfo.xml
+Source8: generate-modalias-metadata.py
BuildArch: noarch
-Provides: wl-kmod-common = %{version}
-Requires: wl-kmod >= %{version}
+Provides: wl-kmod-common = %{?epoch}:%{version}
+Requires: wl-kmod >= %{?epoch}:%{version}
ExcludeArch: ppc ppc64
+%if 0%{?fedora} >= 25
+# AppStream metadata generation
+BuildRequires: python3
+BuildRequires: libappstream-glib >= 0.6.3
+%endif
+
%description
-This package contains the license, README.txt and configuration
-files for the Broadcom 802.11 Linux STA Driver for WiFi, a Linux
-device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-,
-BCM4321-, BCM4322-, BCM43142-, BCM43224-, BCM43225-, BCM43227-,
+This package contains the license, README.txt and configuration
+files for the Broadcom 802.11 Linux STA Driver for WiFi, a Linux
+device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-,
+BCM4321-, BCM4322-, BCM43142-, BCM43224-, BCM43225-, BCM43227-,
BCM43228-, BCM4331-, BCM4360 and -BCM4352- based hardware.
%prep
@@ -38,30 +57,47 @@ chmod 644 lib/LICENSE.txt README_6.30.223.271.txt fedora.readme
echo "Nothing to build."
%install
-rm -rf $RPM_BUILD_ROOT
-install -m 0755 -d ${RPM_BUILD_ROOT}%{_prefix}/lib/modprobe.d/
-install -p -m 0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_prefix}/lib/modprobe.d/
-install -m 0755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/dracut.conf.d/
-install -p -m 0644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/dracut.conf.d/
-install -m 0755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/akmods/akmod-wl/
-install -p -m 0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/akmods/akmod-wl/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -m 0755 -d %{buildroot}%{_modprobe_d}
+install -p -m 0644 %{SOURCE3} %{buildroot}%{_modprobe_d}/
+install -m 0755 -d %{buildroot}%{_dracut_conf_d}
+install -p -m 0644 %{SOURCE4} %{buildroot}%{_dracut_conf_d}/
+install -m 0755 -d %{buildroot}%{_sysconfdir}/akmods/akmod-wl/
+install -p -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/akmods/akmod-wl/
+%if 0%{?fedora} >= 25
+# install AppData and add modalias provides
+install -m 0755 -d %{buildroot}%{_datadir}/appdata/
+install -p -m 0644 %{SOURCE7} %{buildroot}%{_datadir}/appdata/
+fn=%{buildroot}%{_datadir}/appdata/com.broadcom.wireless.hybrid.driver.metainfo.xml
+# As appstream-util deletes all comments in the metainfo.xml file, the
+# copyright must be saved and re-written to the resulting file.
+copyright_string=$(grep Copyright ${fn})
+python3 %{SOURCE8} README_6.30.223.271.txt "SUPPORTED DEVICES" | xargs appstream-util add-provide ${fn} modalias
+grep -q Copyright ${fn} >/dev/null || sed -i "s%\(^<?xml.*$\)%\1\n${copyright_string}%" ${fn}
+%endif
%files
-%defattr(-,root,root,-)
%doc README_6.30.223.271.txt fedora.readme
-%if 0%{?rhel} || 0%{?fedora} < 21
-%doc lib/LICENSE.txt
-%else
+# Caution - testing rhel or fedora value with < or <= operators is risky,
+# while using > or >= operators seems to give the right result.
+# See 07/03/2017 update on http://backreference.org/2011/09/17/some-tips-on-rpm-conditional-macros/
+%if 0%{?rhel} > 6 || 0%{?fedora} > 20
%license lib/LICENSE.txt
+%else
+%doc lib/LICENSE.txt
%endif
-%config(noreplace) %{_prefix}/lib/modprobe.d/broadcom-wl-blacklist.conf
-%config(noreplace) %{_sysconfdir}/dracut.conf.d/20-wl.conf
+%if 0%{?fedora} >= 25
+%{_datadir}/appdata/com.broadcom.wireless.hybrid.driver.metainfo.xml
+%endif
+%config(noreplace) %{_modprobe_d}/broadcom-wl-blacklist.conf
+%config(noreplace) %{_dracut_conf_d}/20-wl.conf
%config(noreplace) %{_sysconfdir}/akmods/akmod-wl/api
%changelog
+* Wed Apr 18 2018 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-5
+- Added AppStream Metadata
+- Update new Broadcom upstream URLs in SPEC file
+- Cleanup and rework SPEC file for RHEL 6.x and 7.x
+
* Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 6.30.223.271-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/com.broadcom.wireless.hybrid.driver.metainfo.xml b/com.broadcom.wireless.hybrid.driver.metainfo.xml
new file mode 100644
index 0000000..7c0b347
--- /dev/null
+++ b/com.broadcom.wireless.hybrid.driver.metainfo.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2018 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -->
+<component type="driver">
+ <id>com.broadcom.wireless.hybrid.driver</id>
+ <name>Broadcom STA wireless driver</name>
+ <summary>Broadcom proprietary hybrid wireless drivers for certain Broadcom wireless devices</summary>
+ <description>
+ <p>
+ Broadcom's IEEE 802.11a/b/g/n hybrid Linux device drivers for use
+ with Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, BCM4322-,
+ BCM43142-, BCM43224-, BCM43225-, BCM43227-, BCM43228-, BCM4331-,
+ BCM4360 and -BCM4352- based hardware.
+ </p>
+ </description>
+ <translation/>
+ <url type="homepage">https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrast...</url>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>LicenseRef-proprietary:Broadcom</project_license>
+ <developer_name>Broadcom Incorporation</developer_name>
+ <keywords>
+ <keyword>Broadcom</keyword>
+ <keyword>driver</keyword>
+ <keyword>Wireless</keyword>
+ <keyword>hybrid</keyword>
+ <keyword>STA</keyword>
+ </keywords>
+ <url type="bugtracker">https://bugzilla.rpmfusion.org</url>
+ <update_contact>broadcom-wl-owner(a)rpmfusion.org</update_contact>
+ <provides>
+ <!-- Auto-generated by generate-modalias-metadata.py -->
+ <!-- <modalias>pci:v000014e4d*sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004311sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004312sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004313sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004315sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004328sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004329sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d0000432asv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d0000432bsv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d0000432csv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d0000432dsv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004331sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004353sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004357sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004358sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004359sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004365sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d000043a0sv*sd*bc02sc80i*</modalias> -->
+ <!-- <modalias>pci:v000014e4d00004727sv*sd*bc02sc80i*</modalias> -->
+ </provides>
+</component>
diff --git a/generate-modalias-metadata.py b/generate-modalias-metadata.py
new file mode 100644
index 0000000..16b1f93
--- /dev/null
+++ b/generate-modalias-metadata.py
@@ -0,0 +1,74 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2016 Richard Hughes <richard(a)hughsie.com>
+# Licensed under the GNU General Public License Version or later
+#
+# Modified to parse broadcom-wl README_6.30.223.271.txt and for python3
+# Copyright (C) 2018 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr>
+# Usage example:
+# python3 generate-modalias-metadata.py README_6.30.223.271.txt "SUPPORTED DEVICES" | \
+# xargs appstream-util add-provide com.broadcom.driver.wireless.hybrid.test.metainfo.xml
+
+from __future__ import print_function
+import sys
+
+def main():
+ if len(sys.argv) != 3:
+ print("usage: %s README_FILE.txt \"header to match\"" % sys.argv[0])
+ return 1
+
+ # open file
+ f = open(sys.argv[1])
+ in_section = False
+ in_table = False
+ pids = []
+ for line in f.readlines():
+
+ # find the right data table
+ if line.find(sys.argv[2]) != -1:
+ in_section = True
+ continue
+ if not in_section:
+ continue
+
+ # remove Windows and Linux line endings
+ line = line.replace('\r', '')
+ line = line.replace('\n', '')
+
+ # end of table
+ if len(line) > 0 and not line.startswith(' '):
+ in_table = False
+ continue
+
+ # empty line
+ if len(line) == 0:
+ continue
+
+ # skip the header
+ if line.startswith(' -----'):
+ in_table = True
+ continue
+ if not in_table:
+ continue
+
+ # end of section
+ if len(line) > 0 and not line.startswith(' '):
+ in_section = False
+ in_table = False
+ continue
+
+ if line.find('0x14e4') != -1:
+ # get name
+ pid = int((line.split("0x14e4",1)[1]).split()[0], 16)
+ if not pid in pids:
+ pids.append(pid)
+
+ # output
+ vid = 0x14e4
+ print("pci:v%08xd*sv*sd*bc02sc80i*" % (vid))
+ for pid in pids:
+ print("pci:v%08xd%08xsv*sd*bc02sc80i*" % (vid, pid))
+
+if __name__ == "__main__":
+ main()
diff --git a/sources b/sources
index 4c58ee8..d764dc2 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
115903050c41d466161784d4c843f4f9 hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz
4e75f4cb7d87f690f9659ffc478495f0 hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz
3f3fd4d541bb11f12aaf7b3e1dd7ec71 broadcom-wl-blacklist.conf
-458ea8d99c83769d4acf98137f0d46bb README_6.30.223.271.txt
+e3dab6d9dea12b6487ccf24d012e0350 README_6.30.223.271.txt
6 years, 7 months
[wl-kmod] Add patch for GCC >= 8 - fix strncpy truncation compiler warnings
by Nicolas Viéville
commit ef3d6e69c341c0bbab7d3ca7c1a2ea0a92d03744
Author: Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr>
Date: Thu Apr 19 19:56:08 2018 +0200
Add patch for GCC >= 8 - fix strncpy truncation compiler warnings
wl-kmod-013_gcc8_fix_bounds_check_warnings.patch | 18 ++++++++++++++++++
wl-kmod.spec | 7 ++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod-013_gcc8_fix_bounds_check_warnings.patch b/wl-kmod-013_gcc8_fix_bounds_check_warnings.patch
new file mode 100644
index 0000000..625326c
--- /dev/null
+++ b/wl-kmod-013_gcc8_fix_bounds_check_warnings.patch
@@ -0,0 +1,18 @@
+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 2018-02-15 00:54:30.184690464 +0100
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2018-04-18 08:07:30.068342420 +0200
+@@ -2986,7 +2986,14 @@
+ }
+
+ ASSERT(strlen(wlif->name) > 0);
++#if __GNUC__ < 8
+ strncpy(wlif->dev->name, wlif->name, strlen(wlif->name));
++#else
++ // Should have been:
++ // strncpy(wlif->dev->name, wlif->name, sizeof(wlif->dev->name) - 1);
++ // wlif->dev->name[sizeof(wlif->dev->name) - 1] = '\0';
++ memcpy(wlif->dev->name, wlif->name, strlen(wlif->name));
++#endif
+
+ wl->monitor_dev = dev;
+ if (wl->monitor_type == 1)
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 0854399..065e94d 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -8,7 +8,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -28,6 +28,7 @@ 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
+Patch12: wl-kmod-013_gcc8_fix_bounds_check_warnings.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -80,6 +81,7 @@ pushd %{name}-%{version}-src
%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
+%patch12 -p1 -b .gcc8_fix_bounds_check_warnings
popd
for kernel_version in %{?kernel_versions} ; do
@@ -109,6 +111,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Apr 17 2018 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-18
+- Add patch for GCC >= 8 - fix strncpy truncation compiler warnings
+
* Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 6.30.223.271-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 7 months
[qtox/f27] Upstream release 1.14.1
by Robert-André Mauchin
commit 065d3dac600f60d150656fa18c0815126da37b15
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Thu Apr 19 19:38:21 2018 +0200
Upstream release 1.14.1
.gitignore | 1 +
...a-file-installation-to-usr-share-metainfo.patch | 26 ----------------------
qtox.spec | 10 ++++-----
sources | 2 +-
4 files changed, 7 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32a4556..a4e5df5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/qtox-1.13.0.tar.gz
+/qtox-1.14.1.tar.gz
diff --git a/qtox.spec b/qtox.spec
index a16d261..d9ab7e4 100644
--- a/qtox.spec
+++ b/qtox.spec
@@ -1,6 +1,6 @@
Name: qtox
-Version: 1.13.0
-Release: 2%{?dist}
+Version: 1.14.1
+Release: 1%{?dist}
Summary: Feature-rich Tox client
# Main program: GPLv3+
@@ -15,8 +15,6 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: qtox-1.11.0-remove_project_group.patch
# Remove -Werror from compile flags
Patch1: qtox-1.12.1-disable_Werror.patch
-# https://github.com/qTox/qTox/issues/4958
-Patch2: 0001-Move-Appdata-file-installation-to-usr-share-metainfo.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -49,7 +47,6 @@ BuildRequires: pkgconfig(sqlite3)
BuildRequires: qt5-linguist
Requires: hicolor-icon-theme
-
%description
qTox is a powerful Tox client that follows the Tox design
guidelines while running on all major platforms.
@@ -90,6 +87,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/qTox.appd
%changelog
+* Thu Apr 19 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.14.1-1
+- Upstream release 1.14.1
+
* Fri Feb 16 2018 Robert-André Mauchin <zebob.m(a)gmail.com> 1.13.0-2
- Spec file refresh
- Move Appdata to metainfo
diff --git a/sources b/sources
index c813338..7a54a1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-beb03acac42c0678050f916fc5252eba qtox-1.13.0.tar.gz
+2e3c15d15ac2a4ebafcfb1287fe2eae4 qtox-1.14.1.tar.gz
6 years, 7 months
[qtox/f28] Upstream release 1.14.1
by Robert-André Mauchin
commit c4873989d163f012accddeef205d3bd4af4fa857
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Thu Apr 19 19:38:21 2018 +0200
Upstream release 1.14.1
.gitignore | 1 +
...a-file-installation-to-usr-share-metainfo.patch | 26 ----------------------
qtox.spec | 10 ++++-----
sources | 2 +-
4 files changed, 7 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32a4556..a4e5df5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/qtox-1.13.0.tar.gz
+/qtox-1.14.1.tar.gz
diff --git a/qtox.spec b/qtox.spec
index b8e486d..909c933 100644
--- a/qtox.spec
+++ b/qtox.spec
@@ -1,6 +1,6 @@
Name: qtox
-Version: 1.13.0
-Release: 3%{?dist}
+Version: 1.14.1
+Release: 1%{?dist}
Summary: Feature-rich Tox client
# Main program: GPLv3+
@@ -15,8 +15,6 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: qtox-1.11.0-remove_project_group.patch
# Remove -Werror from compile flags
Patch1: qtox-1.12.1-disable_Werror.patch
-# https://github.com/qTox/qTox/issues/4958
-Patch2: 0001-Move-Appdata-file-installation-to-usr-share-metainfo.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -49,7 +47,6 @@ BuildRequires: pkgconfig(sqlite3)
BuildRequires: qt5-linguist
Requires: hicolor-icon-theme
-
%description
qTox is a powerful Tox client that follows the Tox design
guidelines while running on all major platforms.
@@ -90,6 +87,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/qTox.appd
%changelog
+* Thu Apr 19 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.14.1-1
+- Upstream release 1.14.1
+
* Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.13.0-3
- Rebuilt for new ffmpeg snapshot
diff --git a/sources b/sources
index c813338..7a54a1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-beb03acac42c0678050f916fc5252eba qtox-1.13.0.tar.gz
+2e3c15d15ac2a4ebafcfb1287fe2eae4 qtox-1.14.1.tar.gz
6 years, 7 months
[qtox] Upstream release 1.14.1
by Robert-André Mauchin
commit f69820eeb53b5ff274c2fc65eb96141d782afa6e
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Thu Apr 19 19:38:21 2018 +0200
Upstream release 1.14.1
.gitignore | 1 +
...a-file-installation-to-usr-share-metainfo.patch | 26 ----------------------
qtox.spec | 10 ++++-----
sources | 2 +-
4 files changed, 7 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32a4556..a4e5df5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/qtox-1.13.0.tar.gz
+/qtox-1.14.1.tar.gz
diff --git a/qtox.spec b/qtox.spec
index b8e486d..909c933 100644
--- a/qtox.spec
+++ b/qtox.spec
@@ -1,6 +1,6 @@
Name: qtox
-Version: 1.13.0
-Release: 3%{?dist}
+Version: 1.14.1
+Release: 1%{?dist}
Summary: Feature-rich Tox client
# Main program: GPLv3+
@@ -15,8 +15,6 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: qtox-1.11.0-remove_project_group.patch
# Remove -Werror from compile flags
Patch1: qtox-1.12.1-disable_Werror.patch
-# https://github.com/qTox/qTox/issues/4958
-Patch2: 0001-Move-Appdata-file-installation-to-usr-share-metainfo.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -49,7 +47,6 @@ BuildRequires: pkgconfig(sqlite3)
BuildRequires: qt5-linguist
Requires: hicolor-icon-theme
-
%description
qTox is a powerful Tox client that follows the Tox design
guidelines while running on all major platforms.
@@ -90,6 +87,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/qTox.appd
%changelog
+* Thu Apr 19 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.14.1-1
+- Upstream release 1.14.1
+
* Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.13.0-3
- Rebuilt for new ffmpeg snapshot
diff --git a/sources b/sources
index c813338..7a54a1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-beb03acac42c0678050f916fc5252eba qtox-1.13.0.tar.gz
+2e3c15d15ac2a4ebafcfb1287fe2eae4 qtox-1.14.1.tar.gz
6 years, 7 months
[qtox/f26] Upstream release 1.14.1
by Robert-André Mauchin
commit 7197717e1fff439f4cbc4a1f0cb36bc411e0fc44
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Thu Apr 19 19:34:08 2018 +0200
Upstream release 1.14.1
.gitignore | 1 +
...a-file-installation-to-usr-share-metainfo.patch | 26 ----------------------
qtox.spec | 10 ++++-----
sources | 2 +-
4 files changed, 7 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32a4556..a4e5df5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/qtox-1.13.0.tar.gz
+/qtox-1.14.1.tar.gz
diff --git a/qtox.spec b/qtox.spec
index a16d261..d9ab7e4 100644
--- a/qtox.spec
+++ b/qtox.spec
@@ -1,6 +1,6 @@
Name: qtox
-Version: 1.13.0
-Release: 2%{?dist}
+Version: 1.14.1
+Release: 1%{?dist}
Summary: Feature-rich Tox client
# Main program: GPLv3+
@@ -15,8 +15,6 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: qtox-1.11.0-remove_project_group.patch
# Remove -Werror from compile flags
Patch1: qtox-1.12.1-disable_Werror.patch
-# https://github.com/qTox/qTox/issues/4958
-Patch2: 0001-Move-Appdata-file-installation-to-usr-share-metainfo.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -49,7 +47,6 @@ BuildRequires: pkgconfig(sqlite3)
BuildRequires: qt5-linguist
Requires: hicolor-icon-theme
-
%description
qTox is a powerful Tox client that follows the Tox design
guidelines while running on all major platforms.
@@ -90,6 +87,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/qTox.appd
%changelog
+* Thu Apr 19 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.14.1-1
+- Upstream release 1.14.1
+
* Fri Feb 16 2018 Robert-André Mauchin <zebob.m(a)gmail.com> 1.13.0-2
- Spec file refresh
- Move Appdata to metainfo
diff --git a/sources b/sources
index c813338..7a54a1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-beb03acac42c0678050f916fc5252eba qtox-1.13.0.tar.gz
+2e3c15d15ac2a4ebafcfb1287fe2eae4 qtox-1.14.1.tar.gz
6 years, 7 months
[unifi/f26] Update to 5.7.23.
by Richard Shaw
Summary of changes:
fbcb4f4... Update to 5.7.23. (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[unifi/f27] Update to 5.7.23.
by Richard Shaw
Summary of changes:
fbcb4f4... Update to 5.7.23. (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[unifi/f28] Update to 5.7.23.
by Richard Shaw
Summary of changes:
fbcb4f4... Update to 5.7.23. (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months