scm-commits December 2017

scm-commits@lists.fedoraproject.org

1 participants
7346 discussions

hobbes1069 uploaded fldigi-4.0.13.tar.gz for rpms/fldigi
by notifications＠fedoraproject.org 31 Dec '17

31 Dec '17

e5a74da404657356663dd5c115572efcf6525fb8851f5b6e9efc49c042d281d9cbf163ac99ee63396cb08737a5ae9223c1c985d72483b7031b5003174ac80d0d fldigi-4.0.13.tar.gz https://src.fedoraproject.org/lookaside/pkgs/rpms/fldigi/fldigi-4.0.13.tar.…

1 0

hobbes1069 pushed to cqrlog (master). "Disable arm builds until fpc/lazarus is fixed."
by notifications＠fedoraproject.org 31 Dec '17

31 Dec '17

From 4c15aa17e70dca93c28b8f8646e4ed09952c46a7 Mon Sep 17 00:00:00 2001 From: Richard Shaw <hobbes1069(a)gmail.com> Date: Dec 31 2017 16:54:31 +0000 Subject: Disable arm builds until fpc/lazarus is fixed. --- diff --git a/cqrlog.spec b/cqrlog.spec index f939617..f20df5a 100644 --- a/cqrlog.spec +++ b/cqrlog.spec @@ -11,11 +11,10 @@ Patch0: cqrlog-install.patch Patch1: cqrlog-desktop.patch ExclusiveArch: %{fpc_arches} -# fpc broken in rawhide, see: +# fpc/lazarus is broken, see: # https://bugzilla.redhat.com/show_bug.cgi?id=1517323 -%if 0%{?fedora} >= 28 +# https://bugzilla.redhat.com/show_bug.cgi?id=1491788 ExcludeArch: armv7hl -%endif BuildRequires: fpc >= 2.6.4 BuildRequires: lazarus @@ -114,7 +113,7 @@ fi %changelog * Sun Dec 31 2017 Richard Shaw <hobbes1069(a)gmail.com> - 2.2.0-1 - Update to latest upstream release. -- Disable armv7hl on rawhide/28 until fpc is fixed. +- Disable armv7hl until fpc/lazarus is fixed. * Fri Sep 22 2017 Richard Shaw <hobbes1069(a)gmail.com> - 2.1.0-2 - Fix mariadb requires for Fedora 28 and up. https://src.fedoraproject.org/rpms/cqrlog/c/4c15aa17e70dca93c28b8f8646e4ed0…

1 0

hobbes1069 pushed to cqrlog (f27). "Disable arm builds until fpc/lazarus is fixed."
by notifications＠fedoraproject.org 31 Dec '17

31 Dec '17

1 0

mjg pushed to mupdf (f26). "rebase to 1.12"
by notifications＠fedoraproject.org 31 Dec '17

31 Dec '17

From 1d0b5ef41dc16f13340ec0d892348726ab88e933 Mon Sep 17 00:00:00 2001 From: Michael J Gruber <mjg(a)fedoraproject.org> Date: Dec 31 2017 16:18:49 +0000 Subject: rebase to 1.12 --- diff --git a/.gitignore b/.gitignore index 3075256..9ee30b7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /mupdf-1.10a-source.tar.gz /mupdf-1.11-source.tar.gz /mupdf-1.12-rc1-source.tar.gz +/mupdf-1.12.0-source.tar.gz diff --git a/mupdf.spec b/mupdf.spec index a4a6e2e..9dbe684 100644 --- a/mupdf.spec +++ b/mupdf.spec @@ -1,18 +1,17 @@ Name: mupdf -Version: 1.12rc1 -%global origversion 1.12-rc1 +Version: 1.12.0 Release: 1%{?dist} Summary: A lightweight PDF viewer and toolkit Group: Applications/Publishing License: GPLv3 URL: http://mupdf.com/ -Source0: http://mupdf.com/downloads/%{name}-%{origversion}-source.tar.gz +Source0: http://mupdf.com/downloads/%{name}-%{version}-source.tar.gz Source1: %{name}.desktop BuildRequires: gcc make binutils desktop-file-utils coreutils BuildRequires: openjpeg2-devel jbig2dec-devel desktop-file-utils BuildRequires: libjpeg-devel freetype-devel libXext-devel curl-devel BuildRequires: harfbuzz-devel -BuildRequires: glfw-devel mesa-libGL-devel freeglut-devel +BuildRequires: mesa-libGL-devel freeglut-devel Patch0: %{name}-1.12-openjpeg.patch @@ -42,16 +41,16 @@ The mupdf-devel package contains header files for developing applications that use mupdf and static libraries %prep -%setup -q -n %{name}-%{origversion}-source +%setup -q -n %{name}-%{version}-source rm -rf thirdparty %patch0 -p1 %build export XCFLAGS="%{optflags} -fPIC -DJBIG_NO_MEMENTO -DTOFU -DTOFU_CJK" -make %{?_smp_mflags} build=debug verbose=yes HAVE_GLFW=yes SYS_GLFW_CFLAGS="-I%{_includedir}/GL -I%{_includedir}/GLFW" GLFW_LIBS="-lGL -lglfw" +make %{?_smp_mflags} build=debug verbose=yes HAVE_GLUT=yes SYS_GLUT_CFLAGS="-I%{_includedir}/GL" GLUT_LIBS="-lGL -lglut" %install -make DESTDIR=%{buildroot} install prefix=%{_prefix} libdir=%{_libdir} build=debug verbose=yes HAVE_GLFW=yes +make DESTDIR=%{buildroot} install prefix=%{_prefix} libdir=%{_libdir} build=debug verbose=yes HAVE_GLUT=yes ## handle docs on our own rm -rf %{buildroot}/%{_docdir} desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} @@ -82,6 +81,11 @@ update-desktop-database &> /dev/null || : %{_libdir}/lib%{name}*.a %changelog +* Thu Dec 14 2017 Michael J Gruber <mjg(a)fedoraproject.org> - 1.12.0-1 +- rebase to 1.12 +- follow switch from GLFW to GLUT +- follow switch to new version scheme + * Sun Nov 26 2017 Michael J Gruber <mjg(a)fedoraproject.org> - 1.12rc1-1 - rc test diff --git a/sources b/sources index faa4bfd..5e8fec0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mupdf-1.12-rc1-source.tar.gz) = 12b232224b2a73794e3a70270b3dd3d6cdb51400c8ec421f2d96436ec5f221f567634851a9892e60a3fe39d74def6f2c666e301fa6f40c4f28e6a26b5dd5deb6 +SHA512 (mupdf-1.12.0-source.tar.gz) = 11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96 https://src.fedoraproject.org/rpms/mupdf/c/1d0b5ef41dc16f13340ec0d892348726…

1 0

mjg pushed to mupdf (f26). "v1.12RC1 test build"
by notifications＠fedoraproject.org 31 Dec '17

31 Dec '17

From f1b65b7b3d79d16e3000740fd27c33e93b4c65ee Mon Sep 17 00:00:00 2001 From: Michael J Gruber <mjg(a)fedoraproject.org> Date: Nov 26 2017 16:59:11 +0000 Subject: v1.12RC1 test build --- diff --git a/.gitignore b/.gitignore index 767d5d6..3075256 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /mupdf-1.8-source.tar.gz /mupdf-1.10a-source.tar.gz /mupdf-1.11-source.tar.gz +/mupdf-1.12-rc1-source.tar.gz diff --git a/mupdf-1.11-CVE-2017-15369.patch b/mupdf-1.11-CVE-2017-15369.patch deleted file mode 100644 index 3b62e96..0000000 --- a/mupdf-1.11-CVE-2017-15369.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c2663e51238ec8256da7fc61ad580db891d9fe9a Mon Sep 17 00:00:00 2001 -From: Sebastian Rasmussen <sebras(a)gmail.com> -Date: Mon, 25 Sep 2017 13:04:11 +0200 -Subject: [PATCH] Bug 698592: Mark variable fz_var(), avoiding optimization. - -The change in 2707fa9e8e6d17d794330e719dec1b08161fb045 -in build_filter_chain() allows for the variable chain -to reside in a register, which means that the bug is -likely to only be visible if built under optimization. - -First the chain variable is transferred to chain2, then -set to NULL, then when an exception occurs in build_filter() -the filter chain will be freed by build_filter(). Next -the expectation is that execution proceeds to fz_catch() -where fz_drop_stream() would be called with chain == NULL. - -However due to the chain variable residing in a register, -its value is not NULL as expected, but was reset to its -original value upon the exception (since they use setjmp()), -hence fz_drop_stream() is called with a non-NULL value. - -Marking the chain variable with fz_var() prevents the -compiler from allowing the chain variable to reside in -a register and hence its value will remain NULL and -never be reset. ---- - source/pdf/pdf-stream.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/source/pdf/pdf-stream.c b/source/pdf/pdf-stream.c -index baf9f0a..56592b0 100644 ---- a/source/pdf/pdf-stream.c -+++ b/source/pdf/pdf-stream.c -@@ -246,6 +246,8 @@ build_filter_chain(fz_context *ctx, fz_stream *chain, pdf_document *doc, pdf_obj - pdf_obj *p; - int i, n; - -+ fz_var(chain); -+ - fz_try(ctx) - { - n = pdf_array_len(ctx, fs); --- -2.9.1 - diff --git a/mupdf-1.11-CVE-2017-15587.patch b/mupdf-1.11-CVE-2017-15587.patch deleted file mode 100644 index 0640979..0000000 --- a/mupdf-1.11-CVE-2017-15587.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 82df2631d7d0446b206ea6b434ea609b6c28b0e8 Mon Sep 17 00:00:00 2001 -From: Tor Andersson <tor.andersson(a)artifex.com> -Date: Mon, 16 Oct 2017 13:14:25 +0200 -Subject: [PATCH] Check for integer overflow when validating new style xref - Index. - ---- - source/pdf/pdf-xref.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c -index 66bd0ed..6292793 100644 ---- a/source/pdf/pdf-xref.c -+++ b/source/pdf/pdf-xref.c -@@ -924,7 +924,7 @@ pdf_read_new_xref_section(fz_context *ctx, pdf_document *doc, fz_stream *stm, fz - pdf_xref_entry *table; - int i, n; - -- if (i0 < 0 || i1 < 0) -+ if (i0 < 0 || i1 < 0 || (i0+i1) < 0) - fz_throw(ctx, FZ_ERROR_GENERIC, "negative xref stream entry index"); - //if (i0 + i1 > pdf_xref_len(ctx, doc)) - // fz_throw(ctx, FZ_ERROR_GENERIC, "xref stream has too many entries"); --- -2.9.1 - diff --git a/mupdf-1.11-openjpeg.patch b/mupdf-1.11-openjpeg.patch deleted file mode 100644 index 5539cdb..0000000 --- a/mupdf-1.11-openjpeg.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git i/source/fitz/load-jpx.c w/source/fitz/load-jpx.c -index d01de585..9934e47a 100644 ---- i/source/fitz/load-jpx.c -+++ w/source/fitz/load-jpx.c -@@ -443,12 +443,15 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int - } - - #else /* HAVE_LURATECH */ -- -+#ifdef __cplusplus -+extern "C" -+{ - #define OPJ_STATIC - #define OPJ_HAVE_INTTYPES_H - #if !defined(_WIN32) && !defined(_WIN64) - #define OPJ_HAVE_STDINT_H - #endif -+#endif - #define USE_JPIP - - #include <openjpeg.h> -@@ -920,6 +923,9 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int - } - - #endif /* HAVE_LURATECH */ -+#ifdef __cplusplus -+} -+#endif - - #else /* FZ_ENABLE_JPX */ - diff --git a/mupdf-1.12-openjpeg.patch b/mupdf-1.12-openjpeg.patch new file mode 100644 index 0000000..9775b2f --- /dev/null +++ b/mupdf-1.12-openjpeg.patch @@ -0,0 +1,31 @@ +diff --git i/source/fitz/load-jpx.c w/source/fitz/load-jpx.c +index 65699bab..800ee32c 100644 +--- i/source/fitz/load-jpx.c ++++ w/source/fitz/load-jpx.c +@@ -444,12 +444,15 @@ fz_load_jpx_info(fz_context *ctx, const unsigned char *data, size_t size, int *w + } + + #else /* HAVE_LURATECH */ +- ++#ifdef __cplusplus ++extern "C" ++{ + #define OPJ_STATIC + #define OPJ_HAVE_INTTYPES_H + #if !defined(_MSC_VER) || _MSC_VER >= 1600 + #define OPJ_HAVE_STDINT_H + #endif ++#endif + #define USE_JPIP + + #include <openjpeg.h> +@@ -931,6 +934,9 @@ fz_load_jpx_info(fz_context *ctx, const unsigned char *data, size_t size, int *w + } + + #endif /* HAVE_LURATECH */ ++#ifdef __cplusplus ++} ++#endif + + #else /* FZ_ENABLE_JPX */ + diff --git a/mupdf.spec b/mupdf.spec index 0cbab8c..a4a6e2e 100644 --- a/mupdf.spec +++ b/mupdf.spec @@ -1,20 +1,19 @@ Name: mupdf -Version: 1.11 -Release: 9%{?dist} +Version: 1.12rc1 +%global origversion 1.12-rc1 +Release: 1%{?dist} Summary: A lightweight PDF viewer and toolkit Group: Applications/Publishing License: GPLv3 URL: http://mupdf.com/ -Source0: http://mupdf.com/downloads/%{name}-%{version}-source.tar.gz +Source0: http://mupdf.com/downloads/%{name}-%{origversion}-source.tar.gz Source1: %{name}.desktop BuildRequires: gcc make binutils desktop-file-utils coreutils BuildRequires: openjpeg2-devel jbig2dec-devel desktop-file-utils BuildRequires: libjpeg-devel freetype-devel libXext-devel curl-devel BuildRequires: harfbuzz-devel -BuildRequires: glfw-devel mesa-libGL-devel -Patch0: %{name}-1.11-openjpeg.patch -Patch1: %{name}-1.11-CVE-2017-15369.patch -Patch2: %{name}-1.11-CVE-2017-15587.patch +BuildRequires: glfw-devel mesa-libGL-devel freeglut-devel +Patch0: %{name}-1.12-openjpeg.patch %description @@ -43,11 +42,9 @@ The mupdf-devel package contains header files for developing applications that use mupdf and static libraries %prep -%setup -q -n %{name}-%{version}-source +%setup -q -n %{name}-%{origversion}-source rm -rf thirdparty %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build export XCFLAGS="%{optflags} -fPIC -DJBIG_NO_MEMENTO -DTOFU -DTOFU_CJK" @@ -85,6 +82,9 @@ update-desktop-database &> /dev/null || : %{_libdir}/lib%{name}*.a %changelog +* Sun Nov 26 2017 Michael J Gruber <mjg(a)fedoraproject.org> - 1.12rc1-1 +- rc test + * Sat Nov 11 2017 Michael J Gruber <mjg(a)fedoraproject.org> - 1.11-9 - CVE-2017-15369 - CVE-2017-15587 diff --git a/sources b/sources index 103e2b0..faa4bfd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mupdf-1.11-source.tar.gz) = 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63 +SHA512 (mupdf-1.12-rc1-source.tar.gz) = 12b232224b2a73794e3a70270b3dd3d6cdb51400c8ec421f2d96436ec5f221f567634851a9892e60a3fe39d74def6f2c666e301fa6f40c4f28e6a26b5dd5deb6 https://src.fedoraproject.org/rpms/mupdf/c/f1b65b7b3d79d16e3000740fd27c33e9…

1 0

mjg pushed to mupdf (f26). "Bring f27 fixes into f26"
by notifications＠fedoraproject.org 31 Dec '17

31 Dec '17

From 37569fb01e00e8ccba131df5f7e1ef94852304a6 Mon Sep 17 00:00:00 2001 From: Michael J Gruber <mjg(a)fedoraproject.org> Date: Dec 31 2017 16:55:48 +0000 Subject: Bring f27 fixes into f26 --- diff --git a/.gitignore b/.gitignore index 767d5d6..9ee30b7 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /mupdf-1.8-source.tar.gz /mupdf-1.10a-source.tar.gz /mupdf-1.11-source.tar.gz +/mupdf-1.12-rc1-source.tar.gz +/mupdf-1.12.0-source.tar.gz diff --git a/mupdf-1.11-CVE-2017-15369.patch b/mupdf-1.11-CVE-2017-15369.patch deleted file mode 100644 index 3b62e96..0000000 --- a/mupdf-1.11-CVE-2017-15369.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c2663e51238ec8256da7fc61ad580db891d9fe9a Mon Sep 17 00:00:00 2001 -From: Sebastian Rasmussen <sebras(a)gmail.com> -Date: Mon, 25 Sep 2017 13:04:11 +0200 -Subject: [PATCH] Bug 698592: Mark variable fz_var(), avoiding optimization. - -The change in 2707fa9e8e6d17d794330e719dec1b08161fb045 -in build_filter_chain() allows for the variable chain -to reside in a register, which means that the bug is -likely to only be visible if built under optimization. - -First the chain variable is transferred to chain2, then -set to NULL, then when an exception occurs in build_filter() -the filter chain will be freed by build_filter(). Next -the expectation is that execution proceeds to fz_catch() -where fz_drop_stream() would be called with chain == NULL. - -However due to the chain variable residing in a register, -its value is not NULL as expected, but was reset to its -original value upon the exception (since they use setjmp()), -hence fz_drop_stream() is called with a non-NULL value. - -Marking the chain variable with fz_var() prevents the -compiler from allowing the chain variable to reside in -a register and hence its value will remain NULL and -never be reset. ---- - source/pdf/pdf-stream.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/source/pdf/pdf-stream.c b/source/pdf/pdf-stream.c -index baf9f0a..56592b0 100644 ---- a/source/pdf/pdf-stream.c -+++ b/source/pdf/pdf-stream.c -@@ -246,6 +246,8 @@ build_filter_chain(fz_context *ctx, fz_stream *chain, pdf_document *doc, pdf_obj - pdf_obj *p; - int i, n; - -+ fz_var(chain); -+ - fz_try(ctx) - { - n = pdf_array_len(ctx, fs); --- -2.9.1 - diff --git a/mupdf-1.11-CVE-2017-15587.patch b/mupdf-1.11-CVE-2017-15587.patch deleted file mode 100644 index 0640979..0000000 --- a/mupdf-1.11-CVE-2017-15587.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 82df2631d7d0446b206ea6b434ea609b6c28b0e8 Mon Sep 17 00:00:00 2001 -From: Tor Andersson <tor.andersson(a)artifex.com> -Date: Mon, 16 Oct 2017 13:14:25 +0200 -Subject: [PATCH] Check for integer overflow when validating new style xref - Index. - ---- - source/pdf/pdf-xref.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c -index 66bd0ed..6292793 100644 ---- a/source/pdf/pdf-xref.c -+++ b/source/pdf/pdf-xref.c -@@ -924,7 +924,7 @@ pdf_read_new_xref_section(fz_context *ctx, pdf_document *doc, fz_stream *stm, fz - pdf_xref_entry *table; - int i, n; - -- if (i0 < 0 || i1 < 0) -+ if (i0 < 0 || i1 < 0 || (i0+i1) < 0) - fz_throw(ctx, FZ_ERROR_GENERIC, "negative xref stream entry index"); - //if (i0 + i1 > pdf_xref_len(ctx, doc)) - // fz_throw(ctx, FZ_ERROR_GENERIC, "xref stream has too many entries"); --- -2.9.1 - diff --git a/mupdf-1.11-openjpeg.patch b/mupdf-1.11-openjpeg.patch deleted file mode 100644 index 5539cdb..0000000 --- a/mupdf-1.11-openjpeg.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git i/source/fitz/load-jpx.c w/source/fitz/load-jpx.c -index d01de585..9934e47a 100644 ---- i/source/fitz/load-jpx.c -+++ w/source/fitz/load-jpx.c -@@ -443,12 +443,15 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int - } - - #else /* HAVE_LURATECH */ -- -+#ifdef __cplusplus -+extern "C" -+{ - #define OPJ_STATIC - #define OPJ_HAVE_INTTYPES_H - #if !defined(_WIN32) && !defined(_WIN64) - #define OPJ_HAVE_STDINT_H - #endif -+#endif - #define USE_JPIP - - #include <openjpeg.h> -@@ -920,6 +923,9 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int - } - - #endif /* HAVE_LURATECH */ -+#ifdef __cplusplus -+} -+#endif - - #else /* FZ_ENABLE_JPX */ - diff --git a/mupdf-1.12-openjpeg.patch b/mupdf-1.12-openjpeg.patch new file mode 100644 index 0000000..9775b2f --- /dev/null +++ b/mupdf-1.12-openjpeg.patch @@ -0,0 +1,31 @@ +diff --git i/source/fitz/load-jpx.c w/source/fitz/load-jpx.c +index 65699bab..800ee32c 100644 +--- i/source/fitz/load-jpx.c ++++ w/source/fitz/load-jpx.c +@@ -444,12 +444,15 @@ fz_load_jpx_info(fz_context *ctx, const unsigned char *data, size_t size, int *w + } + + #else /* HAVE_LURATECH */ +- ++#ifdef __cplusplus ++extern "C" ++{ + #define OPJ_STATIC + #define OPJ_HAVE_INTTYPES_H + #if !defined(_MSC_VER) || _MSC_VER >= 1600 + #define OPJ_HAVE_STDINT_H + #endif ++#endif + #define USE_JPIP + + #include <openjpeg.h> +@@ -931,6 +934,9 @@ fz_load_jpx_info(fz_context *ctx, const unsigned char *data, size_t size, int *w + } + + #endif /* HAVE_LURATECH */ ++#ifdef __cplusplus ++} ++#endif + + #else /* FZ_ENABLE_JPX */ + diff --git a/mupdf.spec b/mupdf.spec index 7f4d007..45c1607 100644 --- a/mupdf.spec +++ b/mupdf.spec @@ -1,6 +1,6 @@ Name: mupdf -Version: 1.11 -Release: 9%{?dist} +Version: 1.12.0 +Release: 1%{?dist} Summary: A lightweight PDF viewer and toolkit Group: Applications/Publishing License: GPLv3 @@ -11,10 +11,8 @@ BuildRequires: gcc make binutils desktop-file-utils coreutils BuildRequires: openjpeg2-devel jbig2dec-devel desktop-file-utils BuildRequires: libjpeg-devel freetype-devel libXext-devel curl-devel BuildRequires: harfbuzz-devel -BuildRequires: glfw-devel mesa-libGL-devel -Patch0: %{name}-1.11-openjpeg.patch -Patch1: %{name}-1.11-CVE-2017-15369.patch -Patch2: %{name}-1.11-CVE-2017-15587.patch +BuildRequires: mesa-libGL-devel freeglut-devel +Patch0: %{name}-1.12-openjpeg.patch %description @@ -46,15 +44,13 @@ applications that use mupdf and static libraries %setup -q -n %{name}-%{version}-source rm -rf thirdparty %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build export XCFLAGS="%{optflags} -fPIC -DJBIG_NO_MEMENTO -DTOFU -DTOFU_CJK" -make %{?_smp_mflags} build=debug verbose=yes HAVE_GLFW=yes SYS_GLFW_CFLAGS="-I%{_includedir}/GL -I%{_includedir}/GLFW" GLFW_LIBS="-lGL -lglfw" +make %{?_smp_mflags} build=debug verbose=yes HAVE_GLUT=yes SYS_GLUT_CFLAGS="-I%{_includedir}/GL" GLUT_LIBS="-lGL -lglut" %install -make DESTDIR=%{buildroot} install prefix=%{_prefix} libdir=%{_libdir} build=debug verbose=yes HAVE_GLFW=yes +make DESTDIR=%{buildroot} install prefix=%{_prefix} libdir=%{_libdir} build=debug verbose=yes HAVE_GLUT=yes ## handle docs on our own rm -rf %{buildroot}/%{_docdir} desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} @@ -85,6 +81,14 @@ update-desktop-database &> /dev/null || : %{_libdir}/lib%{name}*.a %changelog +* Thu Dec 14 2017 Michael J Gruber <mjg(a)fedoraproject.org> - 1.12.0-1 +- rebase to 1.12 +- follow switch from GLFW to GLUT +- follow switch to new version scheme + +* Sun Nov 26 2017 Michael J Gruber <mjg(a)fedoraproject.org> - 1.12rc1-1 +- rc test + * Sat Nov 11 2017 Michael J Gruber <mjg(a)fedoraproject.org> - 1.11-9 - CVE-2017-15369 - CVE-2017-15587 diff --git a/sources b/sources index 103e2b0..5e8fec0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mupdf-1.11-source.tar.gz) = 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63 +SHA512 (mupdf-1.12.0-source.tar.gz) = 11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96 https://src.fedoraproject.org/rpms/mupdf/c/37569fb01e00e8ccba131df5f7e1ef94…

1 0

hobbes1069 pushed to cqrlog (f26). "Disable arm builds until fpc/lazarus is fixed."
by notifications＠fedoraproject.org 31 Dec '17

31 Dec '17

1 0

mjg pushed to mupdf (f27). "v1.12RC1 test build"
by notifications＠fedoraproject.org 31 Dec '17

31 Dec '17

1 0

mjg pushed to mupdf (f27). "rebase to 1.12"
by notifications＠fedoraproject.org 31 Dec '17

31 Dec '17

1 0

hobbes1069 pushed to cqrlog (f26). "Fix mariadb requires for Fedora 28 and up. (..more)"
by notifications＠fedoraproject.org 31 Dec '17

31 Dec '17

From 6a4381f1886f0a97f0819f9a00e20ffd94e2b94c Mon Sep 17 00:00:00 2001 From: Richard Shaw <hobbes1069(a)gmail.com> Date: Sep 22 2017 12:50:35 +0000 Subject: Fix mariadb requires for Fedora 28 and up. https://bugzilla.redhat.com/show_bug.cgi?id=1486480 --- diff --git a/cqrlog.spec b/cqrlog.spec index 910061b..db24f74 100644 --- a/cqrlog.spec +++ b/cqrlog.spec @@ -1,6 +1,6 @@ Name: cqrlog Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An amateur radio contact logging program License: GPLv2 @@ -19,7 +19,12 @@ BuildRequires: libappstream-glib BuildRequires: desktop-file-utils Requires: mariadb-server +# https://bugzilla.redhat.com/show_bug.cgi?id=1486480 +%if 0%{?fedora} >= 28 +Requires: mariadb-connector-c +%else Requires: mariadb-libs +%endif Requires: hamlib Requires: openssl %if 0%{?fedora} @@ -103,6 +108,10 @@ fi %changelog +* Fri Sep 22 2017 Richard Shaw <hobbes1069(a)gmail.com> - 2.1.0-2 +- Fix mariadb requires for Fedora 28 and up. + https://bugzilla.redhat.com/show_bug.cgi?id=1486480 + * Mon Aug 07 2017 Richard Shaw <hobbes1069(a)gmail.com> - 2.1.0-1 - Update to latest upstream release. https://src.fedoraproject.org/rpms/cqrlog/c/6a4381f1886f0a97f0819f9a00e20ff…

1 0

← Newer
1
2
3
4
5
6
7
...
735
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits December 2017