Merge branch 'palemoon-rpm' into 'palemoon-bump'

Palemoon rpm

See merge request bgstack15/stackrpms!97

3 files changed, 14 insertions, 59 deletions

diff --git a/palemoon/mozilla-1533969-palemoon.patch b/palemoon/mozilla-1533969-palemoon.patch
deleted file mode 100644
index d4ed4c4..0000000
--- a/palemoon/mozilla-1533969-palemoon.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1533969
-From: Emilio Cobos Álvarez (:emilio) https://bugzilla.mozilla.org/user_profile?user_id=546716
-Date: 2019-03-12 15:08 PDT
-Modified for Pale Moon by: B Stack <bgstack15@gmail.com>
-This patch is applicable for all versions of Fedora GNU/Linux, but it really only affects gcc >= 9.1.1 in fc == 31
---- tools/profiler/tasktracer/GeckoTaskTracer.cpp.orig	2019-06-04 18:16:01.000000000 -0400
-+++ tools/profiler/tasktracer/GeckoTaskTracer.cpp	2019-06-13 13:16:29.160643732 -0400
-@@ -20,19 +20,19 @@
- 
- #include <stdarg.h>
- 
--// We need a definition of gettid(), but glibc doesn't provide a
-+// We need a definition of gettid(), but old glibc versions don't provide a
- // wrapper for it.
- #if defined(__GLIBC__)
- #include <unistd.h>
- #include <sys/syscall.h>
--static inline pid_t gettid()
-+#define gettid() static_cast<pid_t>(syscall(SYS_gettid))
- {
-   return (pid_t) syscall(SYS_gettid);
- }
- #elif defined(XP_MACOSX)
- #include <unistd.h>
- #include <sys/syscall.h>
--static inline pid_t gettid()
-+#define gettid() static_cast<pid_t>(syscall(SYS_thread_selfid))
- {
-   return (pid_t) syscall(SYS_thread_selfid);
- }
---- js/src/jsnativestack.cpp.orig	2019-06-04 18:16:01.000000000 -0400
-+++ js/src/jsnativestack.cpp	2019-06-14 08:13:04.080567510 -0400
-@@ -26,11 +26,7 @@
- #  include <sys/syscall.h>
- #  include <sys/types.h>
- #  include <unistd.h>
--static pid_t
--gettid()
--{
--    return syscall(__NR_gettid);
--}
-+#  define gettid() static_cast<pid_t>(syscall(SYS_gettid))
- # endif
- 
- #else
diff --git a/palemoon/palemoon-stackrpms.spec b/palemoon/palemoon-stackrpms.spec
index 2c03106..d0825c1 100644
--- a/palemoon/palemoon-stackrpms.spec
+++ b/palemoon/palemoon-stackrpms.spec
@@ -40,7 +40,7 @@ Summary:	Pale Moon web browser with stackrpms prefs
 Name:    palemoon
 Summary:	Pale Moon web browser
 %endif
-Version:	28.7.1
+Version:	28.7.2
 Release:	1
 
 Group:	Networking/Web
@@ -55,7 +55,6 @@ Source4: bgstack15-palemoon-prefs.js
 Patch0: small-icons.patch
 Patch1: bgstack15-palemoon.patch
 %endif
-Patch100: mozilla-1533969-palemoon.patch
 Packager:	Bgstack15 <bgstack15@gmail.com>
 
 %if "%{?scl_env}" != ""
@@ -74,7 +73,7 @@ BuildRequires:	gtk2-devel
 BuildRequires:	libXt-devel
 BuildRequires:	mesa-libGL-devel
 BuildRequires:	notification-daemon
-BuildRequires:	openssl-devel
+BuildRequires:	%{_libdir}/libssl.so
 BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig(gtk+-2.0)
 BuildRequires:	pulseaudio-libs-devel
@@ -117,10 +116,6 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig
 %if 0%{stackrpms_custom}
 %patch0 -p1
 %patch1 -p1
-
-# Mozilla patches
-# this one is needed for fedora rawhide as of 2019-07.
-%patch100 -p0
 %endif
 
 %build
@@ -284,6 +279,11 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %doc AUTHORS LICENSE
 
 %changelog
+* Wed Oct 30 2019 B Stack <bgstack15@gmail.com> - 28.7.2-1
+- update version
+- remove custom patch for mz1533969 because it was upstreamed
+- buildrequires use ssl lib name instead of package name to use either package
+
 * Thu Sep 12 2019 B Stack <bgstack15@gmail.com> - 28.7.1-1
 - update version
 
diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec
index 7323c91..764e08c 100644
--- a/palemoon/palemoon.spec
+++ b/palemoon/palemoon.spec
@@ -40,7 +40,7 @@ Summary:	Pale Moon web browser with stackrpms prefs
 Name:    palemoon
 Summary:	Pale Moon web browser
 %endif
-Version:	28.7.1
+Version:	28.7.2
 Release:	1
 
 Group:	Networking/Web
@@ -55,7 +55,6 @@ Source4: bgstack15-palemoon-prefs.js
 Patch0: small-icons.patch
 Patch1: bgstack15-palemoon.patch
 %endif
-Patch100: mozilla-1533969-palemoon.patch
 Packager:	Bgstack15 <bgstack15@gmail.com>
 
 %if "%{?scl_env}" != ""
@@ -74,7 +73,7 @@ BuildRequires:	gtk2-devel
 BuildRequires:	libXt-devel
 BuildRequires:	mesa-libGL-devel
 BuildRequires:	notification-daemon
-BuildRequires:	openssl-devel
+BuildRequires:	%{_libdir}/libssl.so
 BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig(gtk+-2.0)
 BuildRequires:	pulseaudio-libs-devel
@@ -117,10 +116,6 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig
 %if 0%{stackrpms_custom}
 %patch0 -p1
 %patch1 -p1
-
-# Mozilla patches
-# this one is needed for fedora rawhide as of 2019-07.
-%patch100 -p0
 %endif
 
 %build
@@ -284,6 +279,11 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %doc AUTHORS LICENSE
 
 %changelog
+* Wed Oct 30 2019 B Stack <bgstack15@gmail.com> - 28.7.2-1
+- update version
+- remove custom patch for mz1533969 because it was upstreamed
+- buildrequires use ssl lib name instead of package name to use either package
+
 * Thu Sep 12 2019 B Stack <bgstack15@gmail.com> - 28.7.1-1
 - update version