diff --git a/disable-insight-tracking.patch b/disable-insight-tracking.patch deleted file mode 100644 index 11849a6..0000000 --- a/disable-insight-tracking.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/build/tasks/build.js b/build/tasks/build.js -index 69916bf..58e65ad 100644 ---- a/build/tasks/build.js -+++ b/build/tasks/build.js -@@ -10,7 +10,6 @@ module.exports = function( grunt ) { - - var fs = require( "fs" ), - requirejs = require( "requirejs" ), -- Insight = require( "insight" ), - pkg = require( "../../package.json" ), - srcFolder = __dirname + "/../../src/", - rdefineEnd = /\}\s*?\);[^}\w]*$/, -@@ -337,46 +336,16 @@ module.exports = function( grunt ) { - grunt.registerTask( "custom", function() { - var args = this.args, - modules = args.length ? args[ 0 ].replace( /,/g, ":" ) : "", -- done = this.async(), -- insight = new Insight( { -- trackingCode: "UA-1076265-4", -- pkg: pkg -- } ); -+ done = this.async(); - - function exec( trackingAllowed ) { -- var tracks = args.length ? args[ 0 ].split( "," ) : []; - var defaultPath = [ "build", "custom" ]; - -- tracks = tracks.map( function( track ) { -- return track.replace( /\//g, "+" ); -- } ); -- -- if ( trackingAllowed ) { -- -- // Track individuals -- tracks.forEach( function( module ) { -- var path = defaultPath.concat( [ "individual" ], module ); -- -- insight.track.apply( insight, path ); -- } ); -- -- // Track full command -- insight.track.apply( insight, defaultPath.concat( [ "full" ], tracks ) ); -- } -- - grunt.task.run( [ "build:*:*" + ( modules ? ":" + modules : "" ), "uglify", "dist" ] ); - done(); - } - - grunt.log.writeln( "Creating custom build...\n" ); - -- // Ask for permission the first time -- if ( insight.optOut === undefined ) { -- insight.askPermission( null, function( error, result ) { -- exec( result ); -- } ); -- } else { -- exec( !insight.optOut ); -- } - } ); - }; diff --git a/generate-source.sh b/generate-source.sh new file mode 100644 index 0000000..ba9829a --- /dev/null +++ b/generate-source.sh @@ -0,0 +1,13 @@ +version=$1 +rm -rf jquery-$version jquery-$version.tar.gz jquery_${version}_node_modules.tar.gz +wget https://github.com/jquery/jquery/archive/$version/jquery-$version.tar.gz + +tar xf jquery-$version.tar.gz + +pushd jquery-$version +npm install --save-dev +tar cfz ../jquery_${version}_node_modules.tar.gz node_modules + +# Husky tries to install a git hook that doesn't play well with dist-git +npm uninstall husky +popd diff --git a/jquery-3.2.1.tar.gz b/jquery-3.2.1.tar.gz deleted file mode 100644 index 9bfeafd..0000000 Binary files a/jquery-3.2.1.tar.gz and /dev/null differ diff --git a/jquery-3.5.0.tar.gz b/jquery-3.5.0.tar.gz new file mode 100644 index 0000000..6167613 Binary files /dev/null and b/jquery-3.5.0.tar.gz differ diff --git a/jquery_3.5.0_node_modules.tar.gz b/jquery_3.5.0_node_modules.tar.gz new file mode 100644 index 0000000..7f18087 Binary files /dev/null and b/jquery_3.5.0_node_modules.tar.gz differ diff --git a/js-jquery-disable-gzip-js.patch b/js-jquery-disable-gzip-js.patch index f9f533e..e3c7231 100644 --- a/js-jquery-disable-gzip-js.patch +++ b/js-jquery-disable-gzip-js.patch @@ -1,14 +1,15 @@ diff --git a/Gruntfile.js b/Gruntfile.js -index 12ae008..5d541f2 100644 +index 486a0f3..5ff8cde 100644 --- a/Gruntfile.js +++ b/Gruntfile.js -@@ -12,8 +12,7 @@ module.exports = function( grunt ) { - return data; +@@ -13,7 +13,6 @@ module.exports = function( grunt ) { } -- var fs = require( "fs" ), -- gzip = require( "gzip-js" ); -+ var fs = require( "fs" ); + var fs = require( "fs" ), +- gzip = require( "gzip-js" ), + isTravis = process.env.TRAVIS, + travisBrowsers = process.env.BROWSERS && process.env.BROWSERS.split( "," ); - if ( !grunt.option( "filename" ) ) { - grunt.option( "filename", "jquery.js" ); +-- +2.23.0 + diff --git a/js-jquery.spec b/js-jquery.spec index 1c56a01..acb910f 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,55 +1,62 @@ -Name: js-jquery -Version: 3.2.1 -Release: 5 -Summary: jQuery is a fast, small, and feature-rich JavaScript library -License: MIT - -URL: https://jquery.com/ -Source0: https://github.com/jquery/jquery/archive/%{version}/jquery-%{version}.tar.gz -Patch0001: %{name}-disable-gzip-js.patch -Patch0002: disable-insight-tracking.patch - -BuildArch: noarch -BuildRequires: web-assets-devel nodejs-packaging js-sizzle-static npm(grunt-cli) -BuildRequires: npm(grunt-contrib-uglify) nodejs-grunt >= 0.4.4-3 npm(shelljs) -BuildRequires: npm(load-grunt-tasks) npm(requirejs) nodejs-strip-json-comments -Requires: web-assets-filesystem - -Provides: jquery = %{version}-%{release} %{name}-static = %{version}-%{release} -Provides: js-jquery3 = %{version}-%{release} js-jquery2-static = %{version}-%{release} - +Name: js-jquery +Version: 3.5.0 +Release: 1 +Summary: JavaScript DOM manipulation, event handling, and AJAX library +BuildArch: noarch +%global ver_x %(echo %{version} | cut -d. -f1) +%global ver_y %(echo %{version} | cut -d. -f2) +%global ver_z %(echo %{version} | cut -d. -f3) +License: MIT +URL: https://jquery.com/ +Source0: https://github.com/jquery/jquery/archive/%{version}/jquery-%{version}.tar.gz +#Created by ./generate-source.sh +Source1: jquery_%{version}_node_modules.tar.gz +Source2: generate-source.sh +Patch1: %{name}-disable-gzip-js.patch +BuildRequires: web-assets-devel nodejs-packaging +Provides: jquery = %{version}-%{release} +Provides: %{name}-static = %{version}-%{release} +Provides: %{name}%{ver_x} = %{version}-%{release} +Provides: %{name}%{ver_x}-static = %{version}-%{release} +Requires: web-assets-filesystem +Provides: bundled(sizzle) = 2.3.5 +Provides: bundled(js-sizzle) = 2.3.5 %description -jQuery is a fast, small, and feature-rich JavaScript library. With easy-to-use APIs -(available in multiple browsers), iterating and manipulating HTML documents, event handling, -animation, and Ajax is much easier. With both versatility and extensibility, jQuery has changed -the way millions of people write JavaScript. +jQuery is a fast, small, and feature-rich JavaScript library. It makes things +like HTML document traversal and manipulation, event handling, animation, and +Ajax much simpler with an easy-to-use API that works across a multitude of +browsers. With a combination of versatility and extensibility, jQuery has +changed the way that millions of people write JavaScript. %prep -%autosetup -n jquery-%{version} -p1 - -rm -rf dist/* src/sizzle -install -Dp %{_jsdir}/sizzle/latest/sizzle.js src/sizzle/dist/sizzle.js +%autosetup -n jquery-%{version} -v -p1 +rm -rf dist/* +tar xf %{SOURCE1} %build -%nodejs_symlink_deps --build -grunt -v 'build:*:*' uglify +./node_modules/grunt-cli/bin/grunt -v 'build:*:*' uglify + +%check +./node_modules/grunt-cli/bin/grunt -v 'build:*:*' test:prepare test:fast %install -install -d %{buildroot}%{_jsdir}/jquery/%{version} -cp -p dist/* %{buildroot}%{_jsdir}/jquery/%{version} - -install -d %{buildroot}%{_webassetdir} +%global installdir %{buildroot}%{_jsdir}/jquery +mkdir -p %{installdir}/%{version} +cp -p dist/* %{installdir}/%{version} +mkdir -p %{buildroot}%{_webassetdir} ln -s ../javascript/jquery %{buildroot}%{_webassetdir}/jquery -ln -s %{version} %{buildroot}%{_jsdir}/jquery/latest -ln -s %{version} %{buildroot}%{_jsdir}/jquery/3 -ln -s %{version} %{buildroot}%{_jsdir}/jquery/3.2 +ln -s %{version} %{installdir}/latest +ln -s %{version} %{installdir}/%{ver_x} +ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %files -%doc AUTHORS.txt CONTRIBUTING.md LICENSE.txt README.md %{_jsdir}/jquery %{_webassetdir}/jquery +%doc AUTHORS.txt CONTRIBUTING.md LICENSE.txt README.md %changelog +* Wed Sep 2 2020 zhanghua - 3.5.0-1 +- update to 3.5.0 + * Thu Dec 12 2019 duyeyu - 3.2.1-5 - init package - diff --git a/js-jquery.yaml b/js-jquery.yaml new file mode 100644 index 0000000..afafaad --- /dev/null +++ b/js-jquery.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: jquery/jquery +tag_pattern: "^" +seperator: "."