[telegram-desktop/f31] Fixed launcher filename.
by Vitaly Zaitsev
commit 5703f04f01d016808914e957b2f102c40737a90c
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Jan 18 11:45:23 2020 +0100
Fixed launcher filename.
telegram-desktop.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index d2aec68..53d859d 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -300,7 +300,7 @@ pushd %{_target_platform}
-DTDESKTOP_DISABLE_AUTOUPDATE:BOOL=ON \
-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME:BOOL=ON \
-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION:BOOL=ON \
- -DTDESKTOP_LAUNCHER_FILENAME=%{name}.desktop \
+ -DTDESKTOP_LAUNCHER_FILENAME=telegramdesktop.desktop \
..
popd
%ninja_build -C %{_target_platform}
4 years, 4 months
[telegram-desktop/f31] Removed obsolete downstream patches.
by Vitaly Zaitsev
commit c10c29fe1b5095e4dd93c1b567883e39f5e48c11
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Jan 18 11:18:27 2020 +0100
Removed obsolete downstream patches.
telegram-desktop-fix-appdata.patch | 24 ------------------------
telegram-desktop-fix-desktop.patch | 29 -----------------------------
telegram-desktop.spec | 22 ++++++++--------------
3 files changed, 8 insertions(+), 67 deletions(-)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 07e49e9..d2aec68 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -91,8 +91,6 @@ Source11: https://github.com/desktop-app/lib_ui/archive/%{commit11}/lib_ui-%{sho
Source12: https://github.com/desktop-app/codegen/archive/%{commit12}/codegen-%{shor...
# Permanent downstream patches...
-Patch0: %{name}-fix-desktop.patch
-Patch1: %{name}-fix-appdata.patch
Patch10: cmake_helpers-system-expected.patch
Patch11: cmake_helpers-system-gsl.patch
Patch12: cmake_helpers-system-qrcode.patch
@@ -262,10 +260,6 @@ pushd Telegram
mv codegen-%{commit12} codegen
popd
-# Applying patches for core application...
-%patch0 -p1 -b .desktop
-%patch1 -p1 -b .appdata
-
# Applying patches for build system...
%patch10 -d cmake -p1 -b .system-expected
%patch11 -d cmake -p1 -b .system-gsl
@@ -317,34 +311,34 @@ mkdir -p %{buildroot}%{_bindir}
install -m 0755 -p %{_target_platform}/bin/Telegram %{buildroot}%{_bindir}/%{name}
# Installing desktop shortcut...
-mv lib/xdg/telegramdesktop.desktop lib/xdg/%{name}.desktop
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications lib/xdg/%{name}.desktop
+desktop-file-install --copy-name-to-generic-name --dir=%{buildroot}%{_datadir}/applications lib/xdg/telegramdesktop.desktop
# Installing icons...
for size in 16 32 48 64 128 256 512; do
dir=%{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps
install -d $dir
- install -m 0644 -p Telegram/Resources/art/icon${size}.png $dir/%{name}.png
+ install -m 0644 -p Telegram/Resources/art/icon${size}.png $dir/telegram.png
done
# Installing appdata for Gnome Software...
install -d %{buildroot}%{_metainfodir}
-install -m 0644 -p lib/xdg/telegramdesktop.appdata.xml %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+install -m 0644 -p lib/xdg/telegramdesktop.appdata.xml %{buildroot}%{_metainfodir}
%check
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%files
%doc README.md changelog.txt
%license LICENSE LEGAL
%{_bindir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_metainfodir}/%{name}.appdata.xml
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_metainfodir}/*.appdata.xml
%changelog
* Fri Jan 17 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.9.4-1
- Updated to version 1.9.4.
+- Removed obsolete downstream patches.
* Thu Jan 09 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.9.3-1
- Updated to version 1.9.3.
4 years, 4 months
[vlc/f30: 24/24] Merge branch 'master' into f30
by Nicolas Chauvet
commit f2f9b67de537a2f41138899d657607bae401fe92
Merge: c391c26 b83425f
Author: Nicolas Chauvet <nchauvet(a)linagora.com>
Date: Sat Jan 18 10:35:31 2020 +0100
Merge branch 'master' into f30
Fix_aom_abi_break.patch | 11 +
libplacebo_patch_1.patch | 27 +-
mmal_8.patch => mmal_16.patch | 8912 +++++++++++++++++++++++++++--------------
sources | 2 +-
vlc.spec | 71 +-
5 files changed, 6041 insertions(+), 2982 deletions(-)
---
4 years, 4 months
[vlc/f30] (24 commits) ...Merge branch 'master' into f30
by Nicolas Chauvet
Summary of changes:
c6d1b17... Rebuild for dav1d and aom SONAME bump (*)
f4574e5... KMA (*)
cd672b5... Restore ciphers policy for gnutls (*)
b5ab699... Add el8 support (*)
95341b0... Bump release (*)
55623b6... Drop kde-filesystem support (*)
01e0109... Update changelog (*)
78849c8... Drop any phonon support for RHEL (*)
48d97b5... Update to 20191014 (*)
bc72c5e... Update mmal patch (*)
e7263e5... Rebuild for dav1d SONAME bump (*)
4f47bb5... rebuild for libdvdread ABI bump (*)
aba68d5... Rebuild for dav1d 0.5.1 (*)
23d716d... Revert "Rebuild for dav1d 0.5.1" (*)
afb754f... Rebuild for new x265 (*)
3c95485... Mass rebuild for x264 (*)
23b19ea... Rebuild for new libplacebo version (*)
2c95fdb... Update libplacebo patch (*)
8a90824... Rebuild for new protobuf version (*)
2b644df... Update snapshot (*)
268a8d9... Enable mmal-avcodec for rpi (*)
a490358... disable libssh2 on el8 (*)
b83425f... Fixup sftp disabled for el8 (*)
f2f9b67... Merge branch 'master' into f30
(*) This commit already existed in another branch; no separate mail sent
4 years, 4 months
[vlc/f31: 10/10] Merge branch 'master' into f31
by Nicolas Chauvet
commit 4569389949b9b21cdad2e6655d548d34499fb661
Merge: c857534 b83425f
Author: Nicolas Chauvet <nchauvet(a)linagora.com>
Date: Sat Jan 18 10:34:57 2020 +0100
Merge branch 'master' into f31
libplacebo_patch_1.patch | 27 +-
mmal_10.patch => mmal_16.patch | 6834 +++++++++++++++++++++++++---------------
sources | 2 +-
vlc.spec | 28 +-
4 files changed, 4265 insertions(+), 2626 deletions(-)
---
4 years, 4 months
[vlc/el8] (12 commits) ...Fixup sftp disabled for el8
by Nicolas Chauvet
Summary of changes:
4f47bb5... rebuild for libdvdread ABI bump (*)
aba68d5... Rebuild for dav1d 0.5.1 (*)
23d716d... Revert "Rebuild for dav1d 0.5.1" (*)
afb754f... Rebuild for new x265 (*)
3c95485... Mass rebuild for x264 (*)
23b19ea... Rebuild for new libplacebo version (*)
2c95fdb... Update libplacebo patch (*)
8a90824... Rebuild for new protobuf version (*)
2b644df... Update snapshot (*)
268a8d9... Enable mmal-avcodec for rpi (*)
a490358... disable libssh2 on el8 (*)
b83425f... Fixup sftp disabled for el8 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 4 months
[vlc/f31] (10 commits) ...Merge branch 'master' into f31
by Nicolas Chauvet
Summary of changes:
afb754f... Rebuild for new x265 (*)
3c95485... Mass rebuild for x264 (*)
23b19ea... Rebuild for new libplacebo version (*)
2c95fdb... Update libplacebo patch (*)
8a90824... Rebuild for new protobuf version (*)
2b644df... Update snapshot (*)
268a8d9... Enable mmal-avcodec for rpi (*)
a490358... disable libssh2 on el8 (*)
b83425f... Fixup sftp disabled for el8 (*)
4569389... Merge branch 'master' into f31
(*) This commit already existed in another branch; no separate mail sent
4 years, 4 months
[vlc] Fixup sftp disabled for el8
by Nicolas Chauvet
commit b83425fef3983af36dca0779e6e92a47b5cb5e68
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Jan 18 09:54:14 2020 +0100
Fixup sftp disabled for el8
vlc.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index a3c5935..73a61bc 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -334,7 +334,7 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
--enable-lua \
%{?_with_live555:--enable-live555} \
%{?_with_opencv:--enable-opencv} \
- --enable-sftp \
+%{!?el8:--enable-sftp} \
%{?_with_vcdimager:--enable-vcdx} \
%{?_with_rpi: \
--enable-omxil \
@@ -354,7 +354,6 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
%{?!_without_freeworld: --enable-realrtsp} \
--enable-flac \
--enable-tremor \
-%{?el8:--disable-libssh2} \
--enable-speex \
--enable-theora \
--enable-libass \
4 years, 4 months