ppisar pushed to pl (master). "Unbundle jquery-1"

[notifications at fedoraproject.org]

From 221efee9e770f157b961af4bc332268faeddd8b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Mon, 15 Jun 2015 14:58:15 +0200
Subject: Unbundle jquery-1


diff --git a/pl.spec b/pl.spec
index 7fc9502..f274490 100644
--- a/pl.spec
+++ b/pl.spec
@@ -35,6 +35,7 @@ Group:      Development/Languages
 #packages/tipc/tipcutils/tipc-config.c  BSD
 #library/prolog_metainference.pl        EPL
 # Not compiled into a binary package:
+#packages/http/web/js/jquery-1.11.3.min.js  MIT
 #packages/utf8proc/data_generator.rb    MIT
 #packages/xpce/src/msw/simx.h           MIT
 #packages/xpce/src/msw/xpm.h            MIT
@@ -75,6 +76,8 @@ Patch3:     swipl-7.2.0-Fix-JNI.patch
 Patch4:     %{name}-6.2.0-pc.patch
 # Pass -Werrror=format-security, bug #1037250
 Patch5:     %{name}-6.6.0-xpce-Inhibit-compiler-warning-on-sscanf-without-arguments.patch
+# Unbundle jquery
+Patch6:     swipl-7.2.1-Unbundle-jquery1.patch
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  gcc
@@ -87,6 +90,8 @@ BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 # archive
 BuildRequires:  libarchive-devel
+# http
+BuildRequires:  js-jquery1
 # XPCE
 BuildRequires:  libICE-devel
 BuildRequires:  libjpeg-devel
@@ -115,6 +120,8 @@ BuildRequires:  java-devel
 BuildRequires:  zlib-devel
 # helpers for export_dynamic patch
 BuildRequires:  autoconf
+# http
+Requires:       js-jquery1
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, auto-load,
@@ -245,6 +252,7 @@ in Prolog. In both setups it provides a re-entrant bidirectional interface.
 cd packages/xpce
 %patch5 -p1 -b .format
 )
+%patch6 -p1
 (
    cd src
    autoconf
@@ -409,6 +417,7 @@ find packages/jpl/examples -name ".cvsignore" | xargs rm -f
 * Mon Jun 15 2015 Petr Pisar <ppisar at redhat.com> - 7.2.1-1
 - 7.2.1 bump
 - Depend on gcc because glibc-headers package will be removed (bug #1230490)
+- Unbundle jquery-1
 
 * Fri Jun 05 2015 Petr Pisar <ppisar at redhat.com> - 7.2.0-1
 - 7.2.0 bump
diff --git a/swipl-7.2.1-Unbundle-jquery1.patch b/swipl-7.2.1-Unbundle-jquery1.patch
new file mode 100644
index 0000000..c6b7386
--- /dev/null
+++ b/swipl-7.2.1-Unbundle-jquery1.patch
@@ -0,0 +1,72 @@
+From 297ec8a0675a0d5e99c7044989890085b125f60e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Mon, 15 Jun 2015 14:31:34 +0200
+Subject: [PATCH] Unbundle jquery1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This changes the required file name to jquery-1.min.js. The file is
+provided by js-jquery1 RPM package.
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ packages/http/Makefile.in | 14 ++++++++++++--
+ packages/http/jquery.pl   |  2 +-
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/packages/http/Makefile.in b/packages/http/Makefile.in
+index 651efb3..2f41239 100644
+--- a/packages/http/Makefile.in
++++ b/packages/http/Makefile.in
+@@ -19,7 +19,7 @@ JSONOBJ=	json.o
+ WEBSOCKETOBJ=	websocket.o
+ SOLIBS=		http_stream. at SO@ json. at SO@ websocket. at SO@
+ 
+-all:		$(SOLIBS)
++all:		$(SOLIBS) jquery
+ 
+ http_stream. at SO@:	$(STREAMOBJ)
+ 		$(LD) $(LDSOFLAGS) -o $@ $(STREAMOBJ) @LIBS@ $(LIBPLSO)
+@@ -31,6 +31,10 @@ websocket. at SO@:	$(WEBSOCKETOBJ)
+ http_stream.o:	http_error.c http_chunked.c cgi_stream.c stream_range.c \
+ 		multipart.c
+ 
++jquery:
++		rm -f web/js/jquery-1.*.min.js
++	    ln -s $(datarootdir)/javascript/jquery/1/jquery.min.js web/js/jquery-1.min.js
++
+ install:	$(LIBPL) $(SOLIBS)
+ 		mkdir -p $(DESTDIR)$(SOLIBDIR)
+ 		for f in $(SOLIBS); do \
+@@ -44,7 +48,13 @@ install:	$(LIBPL) $(SOLIBS)
+ 		$(INSTALL_DATA) README $(DESTDIR)$(PKGPLLIBDIR)/README$(TXTEXT)
+ 		$(INSTALL_DATA) web/icons/*.png $(DESTDIR)$(PKGPLLIBDIR)/web/icons
+ 		$(INSTALL_DATA) web/css/*.css $(DESTDIR)$(PKGPLLIBDIR)/web/css
+-		$(INSTALL_DATA) web/js/*.js $(DESTDIR)$(PKGPLLIBDIR)/web/js
++		for F in web/js/*.js; do \
++			if test -L "$$F"; then \
++				cp -d "$$F" $(DESTDIR)$(PKGPLLIBDIR)/web/js ;\
++			else \
++				$(INSTALL_DATA) web/js/*.js $(DESTDIR)$(PKGPLLIBDIR)/web/js ;\
++			fi ;\
++		done
+ 		$(MKPKGINDEX)
+ 		$(MKINDEX)
+ 
+diff --git a/packages/http/jquery.pl b/packages/http/jquery.pl
+index 4f2585c..94cecc9 100644
+--- a/packages/http/jquery.pl
++++ b/packages/http/jquery.pl
+@@ -33,7 +33,7 @@
+ :- use_module(library(settings)).
+ :- use_module(library(broadcast)).
+ 
+-:- setting(version, atom, '1.11.3.min',
++:- setting(version, atom, '1.min',
+ 	   'Version of jquery served by the html resource "jquery"').
+ 
+ /** <module> Provide JQuery
+-- 
+2.1.0
+
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/pl.git/commit/?h=master&id=221efee9e770f157b961af4bc332268faeddd8b4