[Mosaic/f25] (3 commits) ...remember to add patch
by Leigh Scott
Summary of changes:
62b558c... Revert "tweak patch so configure find libXpm" (*)
4bbe3c6... Revert "Add build requires libXpm-devel" (*)
283dea3... remember to add patch (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months
[Mosaic] remember to add patch
by Leigh Scott
commit 283dea3102918167147fce55279afa2be77cce6f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Aug 15 18:16:18 2016 +0100
remember to add patch
Mosaic-2.7b5-gcc-compile.patch | 21 +++++++++++++++++++++
Mosaic.spec | 2 ++
2 files changed, 23 insertions(+)
---
diff --git a/Mosaic-2.7b5-gcc-compile.patch b/Mosaic-2.7b5-gcc-compile.patch
new file mode 100644
index 0000000..0cd9200
--- /dev/null
+++ b/Mosaic-2.7b5-gcc-compile.patch
@@ -0,0 +1,21 @@
+--- a/src/newsrc.c
++++ b/src/newsrc.c
+@@ -756,7 +756,7 @@
+ }
+
+ while (fgets (b,MAX_BUF,new))
+- fprintf (old, b);
++ fprintf (old,"%s", b);
+
+ fclose (old);
+ fclose (new);
+@@ -854,7 +854,7 @@
+ seq[0] = 0;
+ newsrc_writeseq (n,seq,MAX_BUF);
+ sprintf (b, "%s%c %s\n", n->name, (n->attribs&naSUBSCRIBED)?':':'!', seq);
+- fprintf (new, b);
++ fprintf (new,"%s", b);
+ n->attribs &= ~(naUPDATE);
+ n = nextgroup (n);
+ }
+
diff --git a/Mosaic.spec b/Mosaic.spec
index fe4b48f..58cf15e 100644
--- a/Mosaic.spec
+++ b/Mosaic.spec
@@ -21,6 +21,7 @@ BuildRequires: openmotif-devel
BuildRequires: libjpeg-devel libpng-devel
BuildRequires: autoconf ImageMagick desktop-file-utils
BuildRequires: libXmu-devel
+Requires: xv
%description
Mosaic is a web browser and client for protocols such as FTP, Usenet, and
@@ -82,6 +83,7 @@ desktop-file-install %{SOURCE1} \
* Mon Aug 15 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.7-0.5.b5
- Patch for libpng changes
- Patch for gcc changes
+- Add Requires xv
* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.7-0.4.b5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
7 years, 10 months
[Mosaic] Revert "Add build requires libXpm-devel"
by Leigh Scott
commit 4bbe3c6d00cec892507374de63695cec4b0624fe
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Aug 15 18:05:53 2016 +0100
Revert "Add build requires libXpm-devel"
This reverts commit a4eaf5e2dbff103d4a9aae81cbecb954bb127c7e.
Mosaic.spec | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/Mosaic.spec b/Mosaic.spec
index 5770b17..fe4b48f 100644
--- a/Mosaic.spec
+++ b/Mosaic.spec
@@ -1,6 +1,6 @@
Name: Mosaic
Version: 2.7
-Release: 0.6.b5%{?dist}
+Release: 0.5.b5%{?dist}
Summary: Web Browser
Group: Applications/Internet
@@ -20,9 +20,7 @@ Patch6: Mosaic-2.7b5-gcc-compile.patch
BuildRequires: openmotif-devel
BuildRequires: libjpeg-devel libpng-devel
BuildRequires: autoconf ImageMagick desktop-file-utils
-BuildRequires: libXmu-devel libXpm-devel
-
-Requires: xv
+BuildRequires: libXmu-devel
%description
Mosaic is a web browser and client for protocols such as FTP, Usenet, and
@@ -81,10 +79,6 @@ desktop-file-install %{SOURCE1} \
%changelog
-* Mon Aug 15 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.7-0.6.b5
-- Add build requires libXpm-devel
-- Add requires xv
-
* Mon Aug 15 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.7-0.5.b5
- Patch for libpng changes
- Patch for gcc changes
7 years, 10 months
[Mosaic] Revert "tweak patch so configure find libXpm"
by Leigh Scott
commit 62b558c75d42bab82e0d68d42e9ca9af964ada03
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Aug 15 18:05:43 2016 +0100
Revert "tweak patch so configure find libXpm"
This reverts commit de549e31a5de0ca095f4f9073168b46d65b65fa3.
Mosaic-2.7b5-compile.patch | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
---
diff --git a/Mosaic-2.7b5-compile.patch b/Mosaic-2.7b5-compile.patch
index d15763d..1e65c70 100644
--- a/Mosaic-2.7b5-compile.patch
+++ b/Mosaic-2.7b5-compile.patch
@@ -58,16 +58,7 @@ diff -up Mosaic-src/config.sub.compile Mosaic-src/config.sub
diff -up Mosaic-src/configure.in.compile Mosaic-src/configure.in
--- Mosaic-src/configure.in.compile 1996-07-11 03:34:40.000000000 +0200
+++ Mosaic-src/configure.in 2009-03-29 16:31:24.016883493 +0200
-@@ -110,7 +110,7 @@
-
- dnl Checks for X11 libraries.
- AC_CHECK_LIB(X11, XSendEvent)
--AC_CHECK_LIB(Xpm, _XpmFreeXpmImage)
-+AC_CHECK_LIB(Xpm, XpmFreeXpmImage)
- AC_CHECK_LIB(ICE, IceProcessMessages)
- AC_CHECK_LIB(SM, SmcCloseConnection)
- AC_CHECK_LIB(Xext, XShapeQueryExtension)
-@@ -119,6 +119,7 @@
+@@ -119,6 +119,7 @@ AC_CHECK_LIB(Xmu, _XEditResCheckMessages
AC_CHECK_LIB(Xm, XmCreatePushButton, [
AC_DEFINE(MOTIF)
LIBS="-lXm ${LIBS}"
@@ -75,7 +66,6 @@ diff -up Mosaic-src/configure.in.compile Mosaic-src/configure.in
])
dnl Checks for typedefs, structures, and compiler characteristics.
-
@@ -144,189 +145,69 @@ dnl as smartly as possible.
AC_MSG_CHECKING(for external software)
echo ""
7 years, 10 months
[Mosaic] tweak patch so configure find libXpm
by Leigh Scott
commit de549e31a5de0ca095f4f9073168b46d65b65fa3
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Aug 15 17:45:14 2016 +0100
tweak patch so configure find libXpm
Mosaic-2.7b5-compile.patch | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/Mosaic-2.7b5-compile.patch b/Mosaic-2.7b5-compile.patch
index 1e65c70..d15763d 100644
--- a/Mosaic-2.7b5-compile.patch
+++ b/Mosaic-2.7b5-compile.patch
@@ -58,7 +58,16 @@ diff -up Mosaic-src/config.sub.compile Mosaic-src/config.sub
diff -up Mosaic-src/configure.in.compile Mosaic-src/configure.in
--- Mosaic-src/configure.in.compile 1996-07-11 03:34:40.000000000 +0200
+++ Mosaic-src/configure.in 2009-03-29 16:31:24.016883493 +0200
-@@ -119,6 +119,7 @@ AC_CHECK_LIB(Xmu, _XEditResCheckMessages
+@@ -110,7 +110,7 @@
+
+ dnl Checks for X11 libraries.
+ AC_CHECK_LIB(X11, XSendEvent)
+-AC_CHECK_LIB(Xpm, _XpmFreeXpmImage)
++AC_CHECK_LIB(Xpm, XpmFreeXpmImage)
+ AC_CHECK_LIB(ICE, IceProcessMessages)
+ AC_CHECK_LIB(SM, SmcCloseConnection)
+ AC_CHECK_LIB(Xext, XShapeQueryExtension)
+@@ -119,6 +119,7 @@
AC_CHECK_LIB(Xm, XmCreatePushButton, [
AC_DEFINE(MOTIF)
LIBS="-lXm ${LIBS}"
@@ -66,6 +75,7 @@ diff -up Mosaic-src/configure.in.compile Mosaic-src/configure.in
])
dnl Checks for typedefs, structures, and compiler characteristics.
+
@@ -144,189 +145,69 @@ dnl as smartly as possible.
AC_MSG_CHECKING(for external software)
echo ""
7 years, 10 months