diff --git a/.gitignore b/.gitignore index 4577c25..247b5fe 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 diff --git a/csslint.in b/csslint.in new file mode 100644 index 0000000..c16f5c0 --- /dev/null +++ b/csslint.in @@ -0,0 +1,3 @@ +#!/bin/sh + +exec java -jar @RHINO_JAR@ @CSSLINT_JS@ "$@" diff --git a/csslint.sh b/csslint.sh deleted file mode 100755 index 48233ca..0000000 --- a/csslint.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -java -jar /usr/share/java/js.jar /usr/share/csslint/csslint-rhino.js $@ diff --git a/csslint.spec b/csslint.spec index cf9f567..264b44b 100644 --- a/csslint.spec +++ b/csslint.spec @@ -1,15 +1,16 @@ -%global commit f1ef64d7cee8f174151db42447dedd3c4ece91c2 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global forgeurl https://github.com/CSSLint/csslint +Version: 1.0.5 + +%forgemeta Name: csslint -Version: 0.10.0 -Release: 12%{?dist} +Release: 1%{?dist} Summary: Detecting potential problems in CSS code License: MIT -URL: http://github.com/stubbornella/csslint -Source0: https://github.com/stubbornella/csslint/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz -Source1: %{name}.sh +URL: http://csslint.net/ +Source0: %{forgesource} +Source1: %{name}.in BuildArch: noarch @@ -24,32 +25,35 @@ you can easily write your own or omit ones you don't want. %prep -%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 +%forgesetup + +sed -e 's|@RHINO_JAR@|%{_datadir}/java/js.jar|g' \ + -e 's|@CSSLINT_JS@|%{_datadir}/%{name}/%{name}-rhino.js|g' \ + < %{SOURCE1} \ + > %{name} %build -# Empty build section, most likely nothing required. %install -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} - +install -d %{buildroot}%{_datadir}/%{name} +install -t %{buildroot}%{_bindir}/ %{name} +install -m 0444 -t %{buildroot}%{_datadir}/%{name}/ dist/%{name}-rhino.js %files %doc CHANGELOG README.md %{_datadir}/%{name} -%attr(755,root,root) %{_bindir}/%{name} +%{_bindir}/%{name} %changelog +* 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 diff --git a/sources b/sources index 012bed2..8a0dd58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24b90466d129cd5a1dd55de464856774 csslint-0.10.0-f1ef64d.tar.gz +SHA512 (csslint-1.0.5.tar.gz) = 8159954ab0777345ba8726732282f84d7f3a0d6269b6e2c9ed6ec9f58512d4ad797fe713be70c3ab88ca6b63602523b30b5ecd38124e02b562215828737edfed