|
 |
221efee |
From 297ec8a0675a0d5e99c7044989890085b125f60e Mon Sep 17 00:00:00 2001
|
|
|
221efee |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
221efee |
Date: Mon, 15 Jun 2015 14:31:34 +0200
|
|
|
221efee |
Subject: [PATCH] Unbundle jquery1
|
|
|
221efee |
MIME-Version: 1.0
|
|
|
221efee |
Content-Type: text/plain; charset=UTF-8
|
|
|
221efee |
Content-Transfer-Encoding: 8bit
|
|
|
221efee |
|
|
|
221efee |
This changes the required file name to jquery-1.min.js. The file is
|
|
|
221efee |
provided by js-jquery1 RPM package.
|
|
|
221efee |
|
|
|
221efee |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
221efee |
---
|
|
|
221efee |
packages/http/Makefile.in | 14 ++++++++++++--
|
|
|
221efee |
packages/http/jquery.pl | 2 +-
|
|
|
221efee |
2 files changed, 13 insertions(+), 3 deletions(-)
|
|
|
221efee |
|
|
|
221efee |
diff --git a/packages/http/Makefile.in b/packages/http/Makefile.in
|
|
|
221efee |
index 651efb3..2f41239 100644
|
|
|
221efee |
--- a/packages/http/Makefile.in
|
|
|
221efee |
+++ b/packages/http/Makefile.in
|
|
|
221efee |
@@ -19,7 +19,7 @@ JSONOBJ= json.o
|
|
|
221efee |
WEBSOCKETOBJ= websocket.o
|
|
|
221efee |
SOLIBS= http_stream.@SO@ json.@SO@ websocket.@SO@
|
|
|
221efee |
|
|
|
221efee |
-all: $(SOLIBS)
|
|
|
221efee |
+all: $(SOLIBS) jquery
|
|
|
221efee |
|
|
|
221efee |
http_stream.@SO@: $(STREAMOBJ)
|
|
|
221efee |
$(LD) $(LDSOFLAGS) -o $@ $(STREAMOBJ) @LIBS@ $(LIBPLSO)
|
|
|
221efee |
@@ -31,6 +31,10 @@ websocket.@SO@: $(WEBSOCKETOBJ)
|
|
|
221efee |
http_stream.o: http_error.c http_chunked.c cgi_stream.c stream_range.c \
|
|
|
221efee |
multipart.c
|
|
|
221efee |
|
|
|
221efee |
+jquery:
|
|
|
221efee |
+ rm -f web/js/jquery-1.*.min.js
|
|
|
221efee |
+ ln -s $(datarootdir)/javascript/jquery/1/jquery.min.js web/js/jquery-1.min.js
|
|
|
221efee |
+
|
|
|
221efee |
install: $(LIBPL) $(SOLIBS)
|
|
|
221efee |
mkdir -p $(DESTDIR)$(SOLIBDIR)
|
|
|
221efee |
for f in $(SOLIBS); do \
|
|
|
221efee |
@@ -44,7 +48,13 @@ install: $(LIBPL) $(SOLIBS)
|
|
|
221efee |
$(INSTALL_DATA) README $(DESTDIR)$(PKGPLLIBDIR)/README$(TXTEXT)
|
|
|
221efee |
$(INSTALL_DATA) web/icons/*.png $(DESTDIR)$(PKGPLLIBDIR)/web/icons
|
|
|
221efee |
$(INSTALL_DATA) web/css/*.css $(DESTDIR)$(PKGPLLIBDIR)/web/css
|
|
|
221efee |
- $(INSTALL_DATA) web/js/*.js $(DESTDIR)$(PKGPLLIBDIR)/web/js
|
|
|
221efee |
+ for F in web/js/*.js; do \
|
|
|
221efee |
+ if test -L "$$F"; then \
|
|
|
221efee |
+ cp -d "$$F" $(DESTDIR)$(PKGPLLIBDIR)/web/js ;\
|
|
|
221efee |
+ else \
|
|
|
221efee |
+ $(INSTALL_DATA) web/js/*.js $(DESTDIR)$(PKGPLLIBDIR)/web/js ;\
|
|
|
221efee |
+ fi ;\
|
|
|
221efee |
+ done
|
|
|
221efee |
$(MKPKGINDEX)
|
|
|
221efee |
$(MKINDEX)
|
|
|
221efee |
|
|
|
221efee |
diff --git a/packages/http/jquery.pl b/packages/http/jquery.pl
|
|
|
221efee |
index 4f2585c..94cecc9 100644
|
|
|
221efee |
--- a/packages/http/jquery.pl
|
|
|
221efee |
+++ b/packages/http/jquery.pl
|
|
|
221efee |
@@ -33,7 +33,7 @@
|
|
|
221efee |
:- use_module(library(settings)).
|
|
|
221efee |
:- use_module(library(broadcast)).
|
|
|
221efee |
|
|
|
221efee |
-:- setting(version, atom, '1.11.3.min',
|
|
|
221efee |
+:- setting(version, atom, '1.min',
|
|
|
221efee |
'Version of jquery served by the html resource "jquery"').
|
|
|
221efee |
|
|
|
221efee |
/** <module> Provide JQuery
|
|
|
221efee |
--
|
|
|
221efee |
2.1.0
|
|
|
221efee |
|