diff --git a/.gitignore b/.gitignore index 5ac553d..4577c25 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,3 @@ /stubbornella-csslint-v0.9.8-0-g2a2cac5.tar.gz /csslint-0.9.10-c31f1b9.tar.gz /csslint-0.10.0-f1ef64d.tar.gz -/csslint-1.0.5.tar.gz -/csslint-1.0.5-bundled-licenses.txt -/csslint-1.0.5-nm-dev.tgz -/csslint-1.0.5-nm-prod.tgz diff --git a/changelog b/changelog deleted file mode 100644 index fcac5b0..0000000 --- a/changelog +++ /dev/null @@ -1,102 +0,0 @@ -* Thu Jan 16 2025 Fedora Release Engineering - 1.0.5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 1.0.5-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 1.0.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.0.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.0.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.0.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.0.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.0.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Aug 30 2021 Peter Oliver - 1.0.5-5 -- Switch JavaScript engine from Rhino to Node.js. - -* Wed Jul 21 2021 Fedora Release Engineering - 1.0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.0.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Oct 7 2020 Peter Oliver - 1.0.5-2 -- Document bundled libs. - -* Wed Oct 7 2020 Peter Oliver - 1.0.5-1 -- Update to 1.0.5. -- Tidy up build. - -* Mon Jul 27 2020 Fedora Release Engineering - 0.10.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 0.10.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 0.10.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 0.10.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 0.10.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0.10.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.10.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.10.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 0.10.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Aug 27 2013 Guillaume Kulakowski - 0.10.0-1 -- Upstream 0.10.0 - -* Sat Aug 03 2013 Fedora Release Engineering - 0.9.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri May 31 2013 Guillaume Kulakowski - 0.9.10-1 -- Upstream 0.9.10 - -* Wed Feb 13 2013 Fedora Release Engineering - 0.9.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 0.9.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 17 2012 Guillaume Kulakowski - 0.9.8-1 -- Upstream 0.9.8 - -* Sun Jan 08 2012 Guillaume Kulakowski - 0.9.2-2 -- Fix attr for Koji build - -* Sun Jan 08 2012 Guillaume Kulakowski - 0.9.2-1 -- Upstream 0.9.2 - -* Fri Dec 23 2011 Guillaume Kulakowski - 0.8.5-1 -- Upstream 0.8.5 - -* Fri Nov 18 2011 Guillaume Kulakowski - 0.8.1-1 -- Initial packaging diff --git a/csslint.in b/csslint.in deleted file mode 100644 index c16f5c0..0000000 --- a/csslint.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec java -jar @RHINO_JAR@ @CSSLINT_JS@ "$@" diff --git a/csslint.sh b/csslint.sh new file mode 100755 index 0000000..48233ca --- /dev/null +++ b/csslint.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +java -jar /usr/share/java/js.jar /usr/share/csslint/csslint-rhino.js $@ diff --git a/csslint.spec b/csslint.spec index 1ea1963..9e8eb35 100644 --- a/csslint.spec +++ b/csslint.spec @@ -1,25 +1,20 @@ -%global npm_name csslint -%global forgeurl https://github.com/CSSLint/csslint -Version: 1.0.5 +%global commit f1ef64d7cee8f174151db42447dedd3c4ece91c2 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%forgemeta - -Name: %{npm_name} -Release: %autorelease +Name: csslint +Version: 0.10.0 +Release: 8%{?dist} Summary: Detecting potential problems in CSS code +Group: Development/Libraries License: MIT -URL: http://csslint.net/ -Source0: %{forgesource} -Source1: %{npm_name}-%{version}-nm-prod.tgz -Source2: %{npm_name}-%{version}-nm-dev.tgz -Source3: %{npm_name}-%{version}-bundled-licenses.txt +URL: http://github.com/stubbornella/csslint +Source0: https://github.com/stubbornella/csslint/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz +Source1: %{name}.sh BuildArch: noarch -ExclusiveArch: %{nodejs_arches} noarch -Requires: /usr/bin/node -BuildRequires: nodejs-devel +Requires: rhino %description @@ -30,45 +25,79 @@ you can easily write your own or omit ones you don't want. %prep -%forgesetup - -cp %{SOURCE3} . -tar xfz %{SOURCE1} -mkdir -p node_modules -pushd node_modules -ln -s ../node_modules_prod/* . -ln -s ../node_modules_prod/.bin . -popd +%setup -qn %{name}-%{commit} +# Executable +cp -p %{SOURCE1} . +sed -i -e 's|@JS_JAR@|%{_datadir}/java/js.jar|g' %{name}.sh +sed -i -e 's|@CSSLINT_RHINO@|%{_datadir}/%{name}/%{name}-rhino.js|g' %{name}.sh %build -chmod a+x dist/cli.js +# Empty build section, most likely nothing required. %install -mkdir -p %{buildroot}%{nodejs_sitelib}/%{npm_name}/ -cp -pr package.json dist/* %{buildroot}%{nodejs_sitelib}/%{npm_name}/ -cp -pr node_modules node_modules_prod %{buildroot}%{nodejs_sitelib}/%{npm_name}/ +install -d %{buildroot}%{_datadir}/%{name} +cp -a release/csslint-rhino.js %{buildroot}%{_datadir}/%{name}/ +install -d %{buildroot}%{_bindir} +cp -a %{name}.sh %{buildroot}%{_bindir}/%{name} -mkdir -p %{buildroot}%{_bindir}/ -ln -sf %{nodejs_sitelib}/%{npm_name}/cli.js %{buildroot}%{_bindir}/%{name} - - -%check -%{__nodejs} -e 'require("./")' -tar xfz %{SOURCE2} -pushd node_modules -ln -s ../node_modules_dev/* . -popd -node_modules_dev/.bin/grunt test %files %doc CHANGELOG README.md -%license LICENSE %{npm_name}-%{version}-bundled-licenses.txt -%{_bindir}/%{name} -%{nodejs_sitelib}/%{npm_name} +%{_datadir}/%{name} +%attr(755,root,root) %{_bindir}/%{name} %changelog -%autochangelog +* Thu Jul 12 2018 Fedora Release Engineering - 0.10.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0.10.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.10.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.10.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 0.10.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Aug 27 2013 Guillaume Kulakowski - 0.10.0-1 +- Upstream 0.10.0 + +* Sat Aug 03 2013 Fedora Release Engineering - 0.9.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri May 31 2013 Guillaume Kulakowski - 0.9.10-1 +- Upstream 0.9.10 + +* Wed Feb 13 2013 Fedora Release Engineering - 0.9.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 0.9.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jul 17 2012 Guillaume Kulakowski - 0.9.8-1 +- Upstream 0.9.8 + +* Sun Jan 08 2012 Guillaume Kulakowski - 0.9.2-2 +- Fix attr for Koji build + +* Sun Jan 08 2012 Guillaume Kulakowski - 0.9.2-1 +- Upstream 0.9.2 + +* Fri Dec 23 2011 Guillaume Kulakowski - 0.8.5-1 +- Upstream 0.8.5 + +* Fri Nov 18 2011 Guillaume Kulakowski - 0.8.1-1 +- Initial packaging diff --git a/sources b/sources index 8d579bb..012bed2 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -SHA512 (csslint-1.0.5-bundled-licenses.txt) = 3e591adb16e09b1c6fb75eb97a6ac51cd06e0aeae2bd5950a15902346e2c9626cb50203bfd0e15c7e8c98af8f24b81c1ce6617c359e7c0e7d0a6366457c844ba -SHA512 (csslint-1.0.5-nm-dev.tgz) = 8ae4ba1c42aa49f1867f49445d65d52d7e4093629a1ef4f75ac682764441024a42d9180aafee8aa8a14009b0dbbe582dbf12f3db6ab41e0cd2025a5c241062c6 -SHA512 (csslint-1.0.5-nm-prod.tgz) = 51ea5af48cf7f9483a88af768691f6829df2c4f387194a8d810abccbb118fec0f3d4af29222e573515c3d5d33f116ef4f66447a603655b752637802db1e37a6a -SHA512 (csslint-1.0.5.tar.gz) = 8159954ab0777345ba8726732282f84d7f3a0d6269b6e2c9ed6ec9f58512d4ad797fe713be70c3ab88ca6b63602523b30b5ecd38124e02b562215828737edfed +24b90466d129cd5a1dd55de464856774 csslint-0.10.0-f1ef64d.tar.gz