diff --git a/create-source.sh b/create-source.sh index 1cdef8c..4a00ad2 100755 --- a/create-source.sh +++ b/create-source.sh @@ -1,25 +1,31 @@ #! /bin/sh jsname=jquery-ui -version=1.14.1 +version=1.12.1 [ -r ${jsname}-${version}.tar.gz ] && \ echo ${jsname}-${version}.tar.gz already exists && exit 1 [ -r ${jsname}-${version}-node-modules.tar.gz ] && \ echo ${jsname}-${version}-node-modules.tar.gz already exists && exit 1 -wget -N https://github.com/jquery/${jsname}/archive/${version}/${jsname}-${version}.tar.gz - curdir=$(pwd) tmpdir=$(mktemp -d) cd ${tmpdir} +# The upstream source bundles a copy of jshint which has a non-free +# license and can not be distributed by Fedora. The source included in +# the srpm has the external/jshint directory removed + +wget -N https://github.com/jquery/${jsname}/archive/${version}/${jsname}-${version}-nonfree.tar.gz +tar -z -x -f ${jsname}-${version}-nonfree.tar.gz +rm -rf ${jsname}-${version}/external/jshint +tar -z -c --group root --owner root -f ${curdir}/${jsname}-${version}.tar.gz ${jsname}-${version} + # We need to bundle build dependencies since they are no longer # available in Fedora. This uses the same technique as the js-jquery # package. -tar -z -x -f ${curdir}/${jsname}-${version}.tar.gz cd ${jsname}-${version} # Reduce the dev dependencies in the package.json file by removing @@ -27,50 +33,36 @@ cd ${jsname}-${version} # build dependencies considerably. patch -p1 <=1.12.0 <5.0.0" +--- a/package.json 2016-09-14 18:31:37.000000000 +0200 ++++ b/package.json 2021-02-27 15:19:34.797763841 +0100 +@@ -52,23 +52,12 @@ }, + "dependencies": {}, "devDependencies": { -- "body-parser": "1.20.3", -- "browserstack-local": "1.5.5", -- "commitplease": "3.2.0", -- "diff": "5.2.0", -- "eslint-config-jquery": "3.0.2", -- "exit-hook": "4.0.0", -- "express": "4.21.1", -- "express-body-parser-error-handler": "1.0.7", - "grunt": "1.6.1", -- "grunt-bowercopy": "1.2.5", -- "grunt-compare-size": "0.4.2", - "grunt-contrib-concat": "2.1.0", -- "grunt-contrib-csslint": "2.0.0", - "grunt-contrib-requirejs": "1.0.0", - "grunt-contrib-uglify": "5.2.2", -- "grunt-eslint": "24.0.1", -- "grunt-git-authors": "3.2.0", -- "grunt-html": "17.1.0", -- "load-grunt-tasks": "5.1.0", -- "rimraf": "6.0.1", -- "selenium-webdriver": "4.26.0", -- "yargs": "17.7.2" -+ "load-grunt-tasks": "5.1.0" +- "commitplease": "2.3.0", + "grunt": "0.4.5", +- "grunt-bowercopy": "1.2.4", + "grunt-cli": "0.1.13", +- "grunt-compare-size": "0.4.0", + "grunt-contrib-concat": "0.5.1", +- "grunt-contrib-csslint": "0.5.0", +- "grunt-contrib-jshint": "0.12.0", +- "grunt-contrib-qunit": "1.0.1", + "grunt-contrib-requirejs": "0.4.4", + "grunt-contrib-uglify": "0.11.1", +- "grunt-git-authors": "3.1.0", +- "grunt-html": "6.0.0", +- "grunt-jscs": "2.1.0", +- "load-grunt-tasks": "3.4.0", +- "rimraf": "2.5.1", +- "testswarm": "1.1.0" ++ "load-grunt-tasks": "3.4.0" }, "keywords": [] } EOF npm install --save-dev - -# This file is not needed for the build -# It just needs to exist to avoid an error -mkdir -p node_modules/grunt-contrib-qunit/chrome -touch node_modules/grunt-contrib-qunit/chrome/bridge.js - tar -z -c --group root --owner root -f ${curdir}/${jsname}-${version}-node-modules.tar.gz node_modules cd ${curdir} diff --git a/js-jquery-ui.spec b/js-jquery-ui.spec index f9d03e2..0af08ad 100644 --- a/js-jquery-ui.spec +++ b/js-jquery-ui.spec @@ -1,13 +1,17 @@ %global jsname jquery-ui Name: js-%{jsname} -Version: 1.14.1 -Release: 3%{?dist} +Version: 1.12.1 +Release: 2%{?dist} Summary: jQuery user interface License: MIT URL: https://jqueryui.com/ -Source0: https://github.com/jquery/%{jsname}/archive/%{version}/%{jsname}-%{version}.tar.gz +# The upstream source bundles a copy of jshint which has a +# non-free license and can not be distributed by Fedora. +# The source included in the srpm has the external/jshint +# directory removed +Source0: %{jsname}-%{version}.tar.gz # We need to bundle build dependencies since they are no # longer available in Fedora. This uses the same # technique as the js-jquery package. @@ -16,11 +20,10 @@ Source1: %{jsname}-%{version}-node-modules.tar.gz Source2: create-source.sh BuildArch: noarch -BuildRequires: nodejs >= 1:16 +BuildRequires: nodejs BuildRequires: web-assets-devel -BuildRequires: python3 -BuildRequires: python3-rcssmin -Requires: js-jquery >= 1.12.0 +BuildRequires: yuicompressor +Requires: js-jquery >= 1.7.0 Requires: web-assets-filesystem %description @@ -29,13 +32,12 @@ themes built on top of the jQuery JavaScript Library. %prep %setup -q -n %{jsname}-%{version} -a 1 -rm -rf dist %build ./node_modules/grunt-cli/bin/grunt -v requirejs:js concat:css uglify:main # Provide a compressed version of the cascading style sheet -python3 -m rcssmin -b < dist/jquery-ui.css > dist/jquery-ui.min.css +yuicompressor -o dist/jquery-ui.min.css dist/jquery-ui.css %install mkdir -p %{buildroot}%{_jsdir}/%{jsname} @@ -49,54 +51,6 @@ install -m 644 -p themes/base/images/* %{buildroot}%{_jsdir}/%{jsname}/images %doc AUTHORS.txt CONTRIBUTING.md README.md %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 1.14.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 1.14.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Nov 13 2024 Mattias Ellert - 1.14.1-1 -- Update to version 1.14.1 - -* Mon Aug 12 2024 Mattias Ellert - 1.14.0-1 -- Update to version 1.14.0 - -* Thu Jul 18 2024 Fedora Release Engineering - 1.13.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sun Apr 28 2024 Mattias Ellert - 1.13.3-1 -- Update to version 1.13.3 - -* Wed Jan 24 2024 Fedora Release Engineering - 1.13.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1.13.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 1.13.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.13.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Nov 11 2022 Mattias Ellert - 1.13.2-1 -- Update to version 1.13.2 - -* Thu Jul 21 2022 Fedora Release Engineering - 1.13.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jul 18 2022 Mattias Ellert - 1.13.0-3 -- Change CSS minifier from yuicompressor to rcssmin on Fedora - -* Thu Jan 20 2022 Fedora Release Engineering - 1.13.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Nov 11 2021 Mattias Ellert - 1.13.0-1 -- Update to version 1.13.0 - -* Thu Jul 22 2021 Fedora Release Engineering - 1.12.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Sat Mar 27 2021 Mattias Ellert - 1.12.1-2 - Provide a compressed version of the cascading style sheet diff --git a/sources b/sources index 5c1f9e2..8e0b141 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jquery-ui-1.14.1.tar.gz) = bd8e8b72da6500481fbfcbe313c8a2bb9c34d99e006488a5f962c3f09a23c4c79ab2ebf0ef04ed0585f9509db7be2aa17b42a424f917c302d68abf38e10030de -SHA512 (jquery-ui-1.14.1-node-modules.tar.gz) = fc9751edaf8ed147554fb0a52f5b42f9998decd9f65ba3fb9737c1b28dc5a3e5fa5c549f6139fa0e2db33fefb06d00a37492f69f43d949deeed7ca02ab5ee20d +SHA512 (jquery-ui-1.12.1.tar.gz) = a3e8eebe64319d8303039e8ec1a092b509ec42f2435a1828edaafdbe5e70705fa059d607d4879317ee33981bb38fed8710da191631fce624b03ba2bd460aaf1a +SHA512 (jquery-ui-1.12.1-node-modules.tar.gz) = c16788f4c91cbbcea9bb072706b5a5aca5391e973dc31c51ba9a961dc04cc7f793d92f671761e43c2a5091f6d094048447268c2f406f01aad22dd7f795b667d5