[get_iplayer] fix changelog spell mistake
by Leigh Scott
commit b39d1088a7bfdc7181e9652aca516e5aa16d91d5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Mar 31 06:31:30 2018 +0100
fix changelog spell mistake
get_iplayer.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/get_iplayer.spec b/get_iplayer.spec
index 752e360..01c8e7e 100644
--- a/get_iplayer.spec
+++ b/get_iplayer.spec
@@ -104,7 +104,7 @@ fi
%changelog
* Sat Mar 31 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.13-2
- Remove all scriplets for fedora
-- Fix inconsistent use of thge buildroot macro
+- Fix inconsistent use of the buildroot macro
* Tue Mar 27 2018 Peter Oliver <rpm(a)mavit.org.uk> - 3.13-1
- Update to version 3.13.
6 years
[get_iplayer] Remove obsolete scriplets and cleanup
by Leigh Scott
commit 3d32a162d6561cbf76949081a5fab776386c74aa
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Mar 31 06:30:01 2018 +0100
Remove obsolete scriplets and cleanup
get_iplayer.spec | 47 ++++++++++++++++++++++-------------------------
1 file changed, 22 insertions(+), 25 deletions(-)
---
diff --git a/get_iplayer.spec b/get_iplayer.spec
index 89874d5..752e360 100644
--- a/get_iplayer.spec
+++ b/get_iplayer.spec
@@ -1,6 +1,6 @@
Name: get_iplayer
Version: 3.13
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lists, records and streams BBC iPlayer TV and radio programmes
Group: Applications/Internet
@@ -10,7 +10,6 @@ Source0: https://github.com/get-iplayer/%{name}/archive/v%{version}.tar.gz#/%{na
Source1: options
Source2: get_iplayer.xml
Source3: get_iplayer.desktop
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: perl-generators
@@ -66,16 +65,26 @@ plugins.
./get_iplayer --manpage=get_iplayer.1 || :
%install
-rm -rf $RPM_BUILD_ROOT
-install -p -D -m0755 get_iplayer $RPM_BUILD_ROOT%{_bindir}/get_iplayer
-install -p -D -m0644 get_iplayer.1 $RPM_BUILD_ROOT%{_mandir}/man1/get_iplayer.1
-install -p -D -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/get_iplayer/options
-install -p -D -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{name}.xml
+install -p -D -m0755 get_iplayer %{buildroot}%{_bindir}/get_iplayer
+install -p -D -m0644 get_iplayer.1 %{buildroot}%{_mandir}/man1/get_iplayer.1
+install -p -D -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/get_iplayer/options
+install -p -D -m0644 %{SOURCE2} %{buildroot}%{_datadir}/mime/packages/%{name}.xml
desktop-file-install --dir=%{buildroot}/%{_datadir}/applications %{SOURCE3}
-%clean
-rm -rf $RPM_BUILD_ROOT
+%if (0%{?rhel} && 0%{?rhel <= 7})
+%post
+/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
+%postun
+/usr/bin/update-desktop-database &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+fi
+
+%posttrans
+/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+%endif
%files
%{_bindir}/get_iplayer
@@ -92,23 +101,11 @@ rm -rf $RPM_BUILD_ROOT
%doc README.md
-%post
-/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
-/usr/bin/update-desktop-database &> /dev/null || :
-
-
-%postun
-/usr/bin/update-desktop-database &> /dev/null || :
-if [ $1 -eq 0 ] ; then
- /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-fi
-
-
-%posttrans
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
-
%changelog
+* Sat Mar 31 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.13-2
+- Remove all scriplets for fedora
+- Fix inconsistent use of thge buildroot macro
+
* Tue Mar 27 2018 Peter Oliver <rpm(a)mavit.org.uk> - 3.13-1
- Update to version 3.13.
6 years
[freetype-freeworld] Update changelog
by Nicolas Chauvet
commit 62b4a65ef130fd90231a59fe2158f5e9b473a7ea
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Mar 30 20:57:20 2018 +0200
Update changelog
freetype-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec
index 82ac60d..80ef7ed 100644
--- a/freetype-freeworld.spec
+++ b/freetype-freeworld.spec
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.8
-Release: 6%{?dist}
+Release: 7%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
@@ -110,6 +110,9 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Fri Mar 30 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 2.8-7
+- Add requires on boolean deps - rfbz#4611
+
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years
[freetype-freeworld] Add requires on boolean deps (fedora only)
by Nicolas Chauvet
commit 4ea5f3ab50d12820a5a73c0c26149eb7e1097da6
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Aug 1 17:59:45 2017 +0200
Add requires on boolean deps (fedora only)
freetype-freeworld.spec | 6 ++++++
1 file changed, 6 insertions(+)
---
diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec
index a7f69a2..82ac60d 100644
--- a/freetype-freeworld.spec
+++ b/freetype-freeworld.spec
@@ -35,6 +35,12 @@ BuildRequires: libpng-devel
BuildRequires: zlib-devel
BuildRequires: bzip2-devel
+%if 0%{?fedora}
+%ifarch x86_64
+Requires: (%{name}(x86-32) = %{version}-%{release} if freetype(x86-32))
+%endif
+%endif
+
%description
The FreeType engine is a free and portable font rendering
engine, developed to provide advanced font support for a variety of
6 years
[chromium-freeworld: 8/8] Merge Fedora, chromium-65.0.3325.181-1
by Miro Hrončok
commit 963e0340d92877f6a9eab545bd14f68e07e301e8
Merge: e9b3537 c747d58
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Thu Mar 29 14:00:57 2018 +0200
Merge Fedora, chromium-65.0.3325.181-1
.gitignore | 1 +
chromium-65.0.3325.162-epel7-stdc++.patch | 12 ++++++++
chromium-browser.desktop | 1 -
chromium-freeworld.spec | 47 ++++++++++++++++++++++++++++---
sources | 2 +-
5 files changed, 57 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index ebc8a50,ddcd939..59eb0fa
--- a/.gitignore
+++ b/.gitignore
@@@ -27,15 -27,18 +27,16 @@@
/chromium-59.0.3071.109-freetype.tar.bz2
/chromium-60.0.3112.90-clean.tar.xz
/chromium-60.0.3112.101-clean.tar.xz
-/chromium-60.0.3112.113-clean.tar.xz
+/chromium-60.0.3112.101.tar.xz
/chromium-60.0.3112.113.tar.xz
/chromium-61.0.3163.79-clean.tar.xz
-/chromium-61.0.3163.100-clean.tar.xz
-/chromium-62.0.3202.75-clean.tar.xz
-/chromium-62.0.3202.89-clean.tar.xz
-/chromium-63.0.3239.84-clean.tar.xz
-/chromium-63.0.3239.108-clean.tar.xz
-/chromium-64.0.3282.119-clean.tar.xz
-/chromium-64.0.3282.140-clean.tar.xz
-/chromium-64.0.3282.167-clean.tar.xz
-/chromium-64.0.3282.186-clean.tar.xz
-/chromium-65.0.3325.146-clean.tar.xz
-/chromium-65.0.3325.162-clean.tar.xz
-/chromium-65.0.3325.181-clean.tar.xz
+/chromium-61.0.3163.79.tar.xz
+/chromium-61.0.3163.100.tar.xz
+/chromium-62.0.3202.62.tar.xz
+/chromium-62.0.3202.89.tar.xz
+/chromium-63.0.3239.108.tar.xz
+/chromium-64.0.3282.119.tar.xz
+/chromium-64.0.3282.167.tar.xz
+/chromium-64.0.3282.186.tar.xz
+/chromium-65.0.3325.162.tar.xz
++/chromium-65.0.3325.181.tar.xz
diff --cc sources
index bfddc9d,17667f6..5c1900e
--- a/sources
+++ b/sources
@@@ -1,2 -1,2 +1,2 @@@
-SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (chromium-65.0.3325.181-clean.tar.xz) = 12a0bb9e367c628c0db80503f6b0570b5ba95fc766c7a782dc7a98290d3b6c13aa5a3f91c4874e98287ca2fafb41af5db34fb951d06594b369baf29c98ed2846
+49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
- 8800f620a2c068c657fc4767cdbfc416 chromium-65.0.3325.162.tar.xz
++717988367527423b897712ec0e25a5dd chromium-65.0.3325.181.tar.xz
6 years
[chromium-freeworld: 7/8] 65.0.3325.181
by Miro Hrončok
commit c747d58e15b97a4aab04b7cf13ef650d6a2d0e07
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Mar 21 16:43:26 2018 -0400
65.0.3325.181
.gitignore | 1 +
chromium.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e50fe8..ddcd939 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
/chromium-64.0.3282.186-clean.tar.xz
/chromium-65.0.3325.146-clean.tar.xz
/chromium-65.0.3325.162-clean.tar.xz
+/chromium-65.0.3325.181-clean.tar.xz
diff --git a/chromium.spec b/chromium.spec
index 50a10fc..845e712 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -122,8 +122,8 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.3325.162
-Release: 3%{?dist}
+Version: %{majorversion}.0.3325.181
+Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -1597,6 +1597,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Wed Mar 21 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.181-1
+- update to 65.0.3325.181
+
* Mon Mar 19 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.162-3
- use bundled libdrm on epel7
diff --git a/sources b/sources
index d2b2768..17667f6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (chromium-65.0.3325.162-clean.tar.xz) = 6f8d2267ca27027a87515e0dfc4aafeb89b2344b994b48c0b7302dd56868e47df46f270c403f7311a2bbacaf5e1eb8b96b31141e9a99080e12321a0d38a618f5
+SHA512 (chromium-65.0.3325.181-clean.tar.xz) = 12a0bb9e367c628c0db80503f6b0570b5ba95fc766c7a782dc7a98290d3b6c13aa5a3f91c4874e98287ca2fafb41af5db34fb951d06594b369baf29c98ed2846
6 years
[chromium-freeworld: 6/8] force lstdc++ on epel7
by Miro Hrončok
commit 0d818fb687afe6de0cb0c4e6b61d858df37731af
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Mar 20 16:17:37 2018 -0400
force lstdc++ on epel7
chromium-65.0.3325.162-epel7-stdc++.patch | 12 ++++++++++++
chromium.spec | 13 +++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/chromium-65.0.3325.162-epel7-stdc++.patch b/chromium-65.0.3325.162-epel7-stdc++.patch
new file mode 100644
index 0000000..ee2066b
--- /dev/null
+++ b/chromium-65.0.3325.162-epel7-stdc++.patch
@@ -0,0 +1,12 @@
+diff -up chromium-65.0.3325.162/build/config/posix/BUILD.gn.epel7 chromium-65.0.3325.162/build/config/posix/BUILD.gn
+--- chromium-65.0.3325.162/build/config/posix/BUILD.gn.epel7 2018-03-20 16:14:42.425926323 -0400
++++ chromium-65.0.3325.162/build/config/posix/BUILD.gn 2018-03-20 16:15:10.150152245 -0400
+@@ -74,6 +74,8 @@ config("runtime_library") {
+ "rt",
+ ]
+ }
++ } else {
++ libs += [ "stdc++" ]
+ }
+
+ if (!is_mac && !is_ios && sysroot != "") {
diff --git a/chromium.spec b/chromium.spec
index fcf87dd..50a10fc 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -246,6 +246,8 @@ Patch84: chromium-65.0.3325.146-GCC-fully-declare-ConfigurationPolicyProvider.pa
Patch85: chromium-65.0.3325.162-boolfix.patch
# From Debian
Patch86: chromium-65.0.3325.162-skia-aarch64-buildfix.patch
+# Use lstdc++ on EPEL7 only
+Patch87: chromium-65.0.3325.162-epel7-stdc++.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
# http://build.chromium.org/buildbot/official/
@@ -720,6 +722,9 @@ udev.
%patch84 -p1 -b .fully-declare
%patch85 -p1 -b .boolfix
%patch86 -p1 -b .aarch64fix
+%if 0%{?rhel} == 7
+%patch87 -p1 -b .epel7
+%endif
%if 0%{?asan}
export CC="clang"
@@ -731,11 +736,7 @@ export CXX="g++"
export AR="ar"
export RANLIB="ranlib"
-%if 0%{?rhel} == 7
-# eh. rhel 7 might need this
-%else
rm -rf buildtools/third_party/libc++/BUILD.gn
-%endif
%if 0%{?nacl}
# prep the nacl tree
@@ -846,11 +847,7 @@ CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true'
CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="Chromium" proprietary_codecs=false'
%endif
CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false linux_use_bundled_binutils=false'
-%if 0%{?rhel} == 7
-CHROMIUM_CORE_GN_DEFINES+=' use_custom_libcxx=true'
-%else
CHROMIUM_CORE_GN_DEFINES+=' use_custom_libcxx=false'
-%endif
%ifarch aarch64
CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"'
%endif
6 years