The package rpms/rust-cssparser.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-cssparser.git/commit/?id=a88299... https://src.fedoraproject.org/cgit/rpms/rust-cssparser.git/commit/?id=dc59d7... https://src.fedoraproject.org/cgit/rpms/rust-cssparser.git/commit/?id=ac8888....
Change: +ExclusiveArch: %{rust_arches} -ExclusiveArch: %{rust_arches} +ExclusiveArch: %{rust_arches}
Thanks.
Full change: ============
commit 040eb7d2cd931683c2ab4a25d2be19d8d506908e Author: Kalev Lember klember@redhat.com Date: Mon Sep 5 19:05:30 2022 +0200
Re-generate spec file with rust2rpm 22
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 2acd7ab..23fbeab 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -1,25 +1,21 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 22 %bcond_without check %global debug_package %{nil}
%global crate cssparser
-Name: rust-%{crate} +Name: rust-cssparser Version: 0.28.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Rust implementation of CSS Syntax Level 3
-# Upstream license specification: MPL-2.0 -License: MPLv2.0 +License: MPL-2.0 URL: https://crates.io/crates/cssparser Source: %{crates_source}
ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif
-BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21
%global _description %{expand: Rust implementation of CSS Syntax Level 3.} @@ -32,13 +28,13 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate.
%files devel -%license LICENSE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/README.md +%{crate_instdir}/
%package -n %{name}+default-devel Summary: %{summary} @@ -46,11 +42,11 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+bench-devel Summary: %{summary} @@ -58,11 +54,11 @@ BuildArch: noarch
%description -n %{name}+bench-devel %{_description}
-This package contains library source intended for building other packages -which use "bench" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "bench" feature of the "%{crate}" crate.
%files -n %{name}+bench-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+dummy_match_byte-devel Summary: %{summary} @@ -70,11 +66,11 @@ BuildArch: noarch
%description -n %{name}+dummy_match_byte-devel %{_description}
-This package contains library source intended for building other packages -which use "dummy_match_byte" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "dummy_match_byte" feature of the "%{crate}" crate.
%files -n %{name}+dummy_match_byte-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serde-devel Summary: %{summary} @@ -82,11 +78,11 @@ BuildArch: noarch
%description -n %{name}+serde-devel %{_description}
-This package contains library source intended for building other packages -which use "serde" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "serde" feature of the "%{crate}" crate.
%files -n %{name}+serde-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml
%prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -108,6 +104,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Mon Sep 05 2022 Kalev Lember klember@redhat.com - 0.28.1-4 +- Re-generate spec file with rust2rpm 22 + * Fri Jan 21 2022 Fedora Release Engineering releng@fedoraproject.org - 0.28.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
commit a8829925a55a941212e230b576e17b7c9b365c92 Author: Tomas Hrcka thrcka@redhat.com Date: Tue Oct 4 09:18:34 2022 +0200
Unretirement request: https://pagure.io/releng/issue/11056
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b8e159d --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +/cssparser-0.23.2.crate +/cssparser-0.23.4.crate +/cssparser-0.23.5.crate +/cssparser-0.23.6.crate +/cssparser-0.23.7.crate +/cssparser-0.23.9.crate +/cssparser-0.23.10.crate +/cssparser-0.24.0.crate +/cssparser-0.24.1.crate +/cssparser-0.25.2.crate +/cssparser-0.25.3.crate +/cssparser-0.25.5.crate +/cssparser-0.25.6.crate +/cssparser-0.25.7.crate +/cssparser-0.25.8.crate +/cssparser-0.25.9.crate +/cssparser-0.27.2.crate +/cssparser-0.28.1.crate diff --git a/README.md b/README.md new file mode 100644 index 0000000..4e21609 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# rust-cssparser + +The rust-cssparser package \ No newline at end of file diff --git a/dead.package b/dead.package deleted file mode 100644 index c7912ba..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -no longer needed diff --git a/rust-cssparser.spec b/rust-cssparser.spec new file mode 100644 index 0000000..2acd7ab --- /dev/null +++ b/rust-cssparser.spec @@ -0,0 +1,208 @@ +# Generated by rust2rpm 17 +%bcond_without check +%global debug_package %{nil} + +%global crate cssparser + +Name: rust-%{crate} +Version: 0.28.1 +Release: 3%{?dist} +Summary: Rust implementation of CSS Syntax Level 3 + +# Upstream license specification: MPL-2.0 +License: MPLv2.0 +URL: https://crates.io/crates/cssparser +Source: %{crates_source} + +ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif + +BuildRequires: rust-packaging + +%global _description %{expand: +Rust implementation of CSS Syntax Level 3.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%license LICENSE +%doc README.md +%{cargo_registry}/%{crate}-%{version_no_tilde}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+bench-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+bench-devel %{_description} + +This package contains library source intended for building other packages +which use "bench" feature of "%{crate}" crate. + +%files -n %{name}+bench-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+dummy_match_byte-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dummy_match_byte-devel %{_description} + +This package contains library source intended for building other packages +which use "dummy_match_byte" feature of "%{crate}" crate. + +%files -n %{name}+dummy_match_byte-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+serde-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+serde-devel %{_description} + +This package contains library source intended for building other packages +which use "serde" feature of "%{crate}" crate. + +%files -n %{name}+serde-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +# https://github.com/servo/rust-cssparser/issues/213 +%cargo_test -- --doc +%endif + +%changelog +* Fri Jan 21 2022 Fedora Release Engineering releng@fedoraproject.org - 0.28.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering releng@fedoraproject.org - 0.28.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue May 11 2021 Fabio Valentini decathorpe@gmail.com - 0.28.1-1 +- Update to version 0.28.1. +- Fixes RHBZ#1904315 + +* Wed Jan 27 2021 Fedora Release Engineering releng@fedoraproject.org - 0.27.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 0.27.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering releng@fedoraproject.org - 0.27.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Feb 15 13:25:32 CET 2020 Igor Raits ignatenkobrain@fedoraproject.org - 0.27.2-1 +- Update to 0.27.2 + +* Thu Jan 30 2020 Fedora Release Engineering releng@fedoraproject.org - 0.25.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 15 2020 Josh Stone jistone@redhat.com - 0.25.9-1 +- Update to 0.25.9 +- Bump to autocfg 1 + +* Fri Jul 26 2019 Fedora Release Engineering releng@fedoraproject.org - 0.25.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jul 07 15:05:26 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.8-1 +- Update to 0.25.8 + +* Sat Jul 06 11:23:45 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.7-1 +- Update to 0.25.7 + +* Thu May 30 17:59:18 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.6-1 +- Update to 0.25.6 + +* Tue Apr 30 09:40:06 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.5-1 +- Update to 0.25.5 + +* Wed Apr 03 2019 Josh Stone jistone@redhat.com - 0.25.3-1 +- Update to 0.25.3 + +* Sun Feb 10 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.2-1 +- Update to 0.25.2 + +* Sat Feb 02 2019 Fedora Release Engineering releng@fedoraproject.org - 0.24.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Oct 04 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.24.1-1 +- Update to 0.24.1 + +* Sun Jul 29 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.24.0-3 +- Bump encoding_rs to 0.8 + +* Sat Jul 14 2018 Fedora Release Engineering releng@fedoraproject.org - 0.24.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat Jun 30 2018 Josh Stone jistone@redhat.com - 0.24.0-1 +- Update to 0.24.0 + +* Sat Jun 23 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org +- Adopt to new macro + +* Thu Jun 14 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.10-1 +- Update to 0.23.10 + +* Tue Jun 05 2018 Josh Stone jistone@redhat.com - 0.23.9-1 +- Update to 0.23.9 + +* Thu May 03 2018 Josh Stone jistone@redhat.com - 0.23.7-1 +- Update to 0.23.7 + +* Sat Apr 28 2018 Josh Stone jistone@redhat.com - 0.23.6-1 +- Update to 0.23.6 + +* Tue Apr 17 2018 Josh Stone jistone@redhat.com - 0.23.5-1 +- Update to 0.23.5 + +* Wed Apr 04 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.4-1 +- Update to 0.23.4 + +* Mon Mar 26 2018 Josh Stone jistone@redhat.com - 0.23.2-4 +- Bump itoa to 0.4.0 + +* Fri Mar 09 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.2-3 +- Bump syn to 0.12, quote to 0.4 + +* Fri Feb 09 2018 Fedora Release Engineering releng@fedoraproject.org - 0.23.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 24 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.2-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..d176253 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (cssparser-0.28.1.crate) = b0a72e1b2ce3fcf74753b14a4fe5c21d9913a32e5a378ab598d83c0996363a2bda64e4d1d693a0ec4535668d5526dfe82a8986ce848d81ae61abb482d2334464
commit dc59d7ed28bde83fc731e49e4e8546c723999fdd Author: Fabio Valentini decathorpe@gmail.com Date: Sun May 1 17:00:45 2022 +0200
no longer needed
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b8e159d..0000000 --- a/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -/cssparser-0.23.2.crate -/cssparser-0.23.4.crate -/cssparser-0.23.5.crate -/cssparser-0.23.6.crate -/cssparser-0.23.7.crate -/cssparser-0.23.9.crate -/cssparser-0.23.10.crate -/cssparser-0.24.0.crate -/cssparser-0.24.1.crate -/cssparser-0.25.2.crate -/cssparser-0.25.3.crate -/cssparser-0.25.5.crate -/cssparser-0.25.6.crate -/cssparser-0.25.7.crate -/cssparser-0.25.8.crate -/cssparser-0.25.9.crate -/cssparser-0.27.2.crate -/cssparser-0.28.1.crate diff --git a/README.md b/README.md deleted file mode 100644 index 4e21609..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-cssparser - -The rust-cssparser package \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..c7912ba --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +no longer needed diff --git a/rust-cssparser.spec b/rust-cssparser.spec deleted file mode 100644 index 2acd7ab..0000000 --- a/rust-cssparser.spec +++ /dev/null @@ -1,208 +0,0 @@ -# Generated by rust2rpm 17 -%bcond_without check -%global debug_package %{nil} - -%global crate cssparser - -Name: rust-%{crate} -Version: 0.28.1 -Release: 3%{?dist} -Summary: Rust implementation of CSS Syntax Level 3 - -# Upstream license specification: MPL-2.0 -License: MPLv2.0 -URL: https://crates.io/crates/cssparser -Source: %{crates_source} - -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging - -%global _description %{expand: -Rust implementation of CSS Syntax Level 3.} - -%description %{_description} - -%package devel -Summary: %{summary} -BuildArch: noarch - -%description devel %{_description} - -This package contains library source intended for building other packages -which use "%{crate}" crate. - -%files devel -%license LICENSE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ - -%package -n %{name}+default-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+default-devel %{_description} - -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. - -%files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+bench-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+bench-devel %{_description} - -This package contains library source intended for building other packages -which use "bench" feature of "%{crate}" crate. - -%files -n %{name}+bench-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+dummy_match_byte-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+dummy_match_byte-devel %{_description} - -This package contains library source intended for building other packages -which use "dummy_match_byte" feature of "%{crate}" crate. - -%files -n %{name}+dummy_match_byte-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+serde-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+serde-devel %{_description} - -This package contains library source intended for building other packages -which use "serde" feature of "%{crate}" crate. - -%files -n %{name}+serde-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 -%cargo_prep - -%generate_buildrequires -%cargo_generate_buildrequires - -%build -%cargo_build - -%install -%cargo_install - -%if %{with check} -%check -# https://github.com/servo/rust-cssparser/issues/213 -%cargo_test -- --doc -%endif - -%changelog -* Fri Jan 21 2022 Fedora Release Engineering releng@fedoraproject.org - 0.28.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering releng@fedoraproject.org - 0.28.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue May 11 2021 Fabio Valentini decathorpe@gmail.com - 0.28.1-1 -- Update to version 0.28.1. -- Fixes RHBZ#1904315 - -* Wed Jan 27 2021 Fedora Release Engineering releng@fedoraproject.org - 0.27.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 0.27.2-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering releng@fedoraproject.org - 0.27.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Feb 15 13:25:32 CET 2020 Igor Raits ignatenkobrain@fedoraproject.org - 0.27.2-1 -- Update to 0.27.2 - -* Thu Jan 30 2020 Fedora Release Engineering releng@fedoraproject.org - 0.25.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jan 15 2020 Josh Stone jistone@redhat.com - 0.25.9-1 -- Update to 0.25.9 -- Bump to autocfg 1 - -* Fri Jul 26 2019 Fedora Release Engineering releng@fedoraproject.org - 0.25.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Jul 07 15:05:26 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.8-1 -- Update to 0.25.8 - -* Sat Jul 06 11:23:45 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.7-1 -- Update to 0.25.7 - -* Thu May 30 17:59:18 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.6-1 -- Update to 0.25.6 - -* Tue Apr 30 09:40:06 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.5-1 -- Update to 0.25.5 - -* Wed Apr 03 2019 Josh Stone jistone@redhat.com - 0.25.3-1 -- Update to 0.25.3 - -* Sun Feb 10 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.2-1 -- Update to 0.25.2 - -* Sat Feb 02 2019 Fedora Release Engineering releng@fedoraproject.org - 0.24.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Oct 04 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.24.1-1 -- Update to 0.24.1 - -* Sun Jul 29 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.24.0-3 -- Bump encoding_rs to 0.8 - -* Sat Jul 14 2018 Fedora Release Engineering releng@fedoraproject.org - 0.24.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Jun 30 2018 Josh Stone jistone@redhat.com - 0.24.0-1 -- Update to 0.24.0 - -* Sat Jun 23 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org -- Adopt to new macro - -* Thu Jun 14 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.10-1 -- Update to 0.23.10 - -* Tue Jun 05 2018 Josh Stone jistone@redhat.com - 0.23.9-1 -- Update to 0.23.9 - -* Thu May 03 2018 Josh Stone jistone@redhat.com - 0.23.7-1 -- Update to 0.23.7 - -* Sat Apr 28 2018 Josh Stone jistone@redhat.com - 0.23.6-1 -- Update to 0.23.6 - -* Tue Apr 17 2018 Josh Stone jistone@redhat.com - 0.23.5-1 -- Update to 0.23.5 - -* Wed Apr 04 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.4-1 -- Update to 0.23.4 - -* Mon Mar 26 2018 Josh Stone jistone@redhat.com - 0.23.2-4 -- Bump itoa to 0.4.0 - -* Fri Mar 09 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.2-3 -- Bump syn to 0.12, quote to 0.4 - -* Fri Feb 09 2018 Fedora Release Engineering releng@fedoraproject.org - 0.23.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 24 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.2-1 -- Initial package diff --git a/sources b/sources deleted file mode 100644 index d176253..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (cssparser-0.28.1.crate) = b0a72e1b2ce3fcf74753b14a4fe5c21d9913a32e5a378ab598d83c0996363a2bda64e4d1d693a0ec4535668d5526dfe82a8986ce848d81ae61abb482d2334464
commit 0917ed9ff950533fa74fd48aab2928a98fdd90bb Author: Fedora Release Engineering releng@fedoraproject.org Date: Fri Jan 21 20:24:39 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 430e7da..2acd7ab 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.28.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Rust implementation of CSS Syntax Level 3
# Upstream license specification: MPL-2.0 @@ -108,6 +108,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Fri Jan 21 2022 Fedora Release Engineering releng@fedoraproject.org - 0.28.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering releng@fedoraproject.org - 0.28.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit f93ca2601273897dcdc0eb041a9ba3daeb8b9267 Author: Fedora Release Engineering releng@fedoraproject.org Date: Fri Jul 23 13:47:48 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 5b86ff2..430e7da 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.28.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Rust implementation of CSS Syntax Level 3
# Upstream license specification: MPL-2.0 @@ -108,6 +108,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Fri Jul 23 2021 Fedora Release Engineering releng@fedoraproject.org - 0.28.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue May 11 2021 Fabio Valentini decathorpe@gmail.com - 0.28.1-1 - Update to version 0.28.1. - Fixes RHBZ#1904315
commit 8bac8093add5520ac75885ec2efb8d24aa0054bf Author: Fabio Valentini decathorpe@gmail.com Date: Tue May 11 14:38:07 2021 +0200
update to version 0.28.1
diff --git a/.gitignore b/.gitignore index c329fcd..b8e159d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /cssparser-0.25.8.crate /cssparser-0.25.9.crate /cssparser-0.27.2.crate +/cssparser-0.28.1.crate diff --git a/cssparser-fix-metadata.diff b/cssparser-fix-metadata.diff deleted file mode 100644 index 87f249b..0000000 --- a/cssparser-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- cssparser-0.25.9/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ cssparser-0.25.9/Cargo.toml 2020-01-15T19:38:01.535351+00:00 -@@ -59,7 +59,7 @@ - [dev-dependencies.serde_json] - version = "1.0" - [build-dependencies.autocfg] --version = "0.1.4" -+version = "1" - - [build-dependencies.proc-macro2] - version = "1" diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 848590d..5b86ff2 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -1,12 +1,12 @@ -# Generated by rust2rpm 13 +# Generated by rust2rpm 17 %bcond_without check %global debug_package %{nil}
%global crate cssparser
Name: rust-%{crate} -Version: 0.27.2 -Release: 4%{?dist} +Version: 0.28.1 +Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
# Upstream license specification: MPL-2.0 @@ -108,6 +108,10 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Tue May 11 2021 Fabio Valentini decathorpe@gmail.com - 0.28.1-1 +- Update to version 0.28.1. +- Fixes RHBZ#1904315 + * Wed Jan 27 2021 Fedora Release Engineering releng@fedoraproject.org - 0.27.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources index 9c8832f..d176253 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.27.2.crate) = 7ab205b05112deffb5c50586106c6f04932a8b5aa1bc3224062abfb65136884f20189ffb1b2402aca5c29cc52c3315492db5c05ac052a70ddea88eb6683df295 +SHA512 (cssparser-0.28.1.crate) = b0a72e1b2ce3fcf74753b14a4fe5c21d9913a32e5a378ab598d83c0996363a2bda64e4d1d693a0ec4535668d5526dfe82a8986ce848d81ae61abb482d2334464
commit 2e9fa5388afa10b92a23eeeb2d12696034b82b57 Author: Fedora Release Engineering releng@fedoraproject.org Date: Wed Jan 27 17:17:25 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index a049ab1..848590d 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.27.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Rust implementation of CSS Syntax Level 3
# Upstream license specification: MPL-2.0 @@ -108,6 +108,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Wed Jan 27 2021 Fedora Release Engineering releng@fedoraproject.org - 0.27.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 0.27.2-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 6b348306b73fcc22c6703401779848eecf4acaf5 Author: Fedora Release Engineering releng@fedoraproject.org Date: Sat Aug 1 08:13:40 2020 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 9c503b6..a049ab1 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.27.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Rust implementation of CSS Syntax Level 3
# Upstream license specification: MPL-2.0 @@ -108,6 +108,10 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 0.27.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering releng@fedoraproject.org - 0.27.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 1638aa8e681f0f9148f16ef9642b619b57180764 Author: Fedora Release Engineering releng@fedoraproject.org Date: Wed Jul 29 07:48:28 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index d406750..9c503b6 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.27.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Rust implementation of CSS Syntax Level 3
# Upstream license specification: MPL-2.0 @@ -108,6 +108,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Wed Jul 29 2020 Fedora Release Engineering releng@fedoraproject.org - 0.27.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Feb 15 13:25:32 CET 2020 Igor Raits ignatenkobrain@fedoraproject.org - 0.27.2-1 - Update to 0.27.2
commit c5401c74d51227532b2cd2e463f2e2f097f56c2f Author: Igor Raits ignatenkobrain@fedoraproject.org Date: Sat Feb 15 13:26:26 2020 +0100
Update to 0.27.2
Signed-off-by: Igor Raits ignatenkobrain@fedoraproject.org
diff --git a/.gitignore b/.gitignore index e563be1..c329fcd 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /cssparser-0.25.7.crate /cssparser-0.25.8.crate /cssparser-0.25.9.crate +/cssparser-0.27.2.crate diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 84491a6..d406750 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -5,17 +5,14 @@ %global crate cssparser
Name: rust-%{crate} -Version: 0.25.9 -Release: 2%{?dist} +Version: 0.27.2 +Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
# Upstream license specification: MPL-2.0 License: MPLv2.0 URL: https://crates.io/crates/cssparser Source: %{crates_source} -# Initial patched metadata -# * Bump to autocfg 1 -Patch0: cssparser-fix-metadata.diff
ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -42,7 +39,6 @@ which use "%{crate}" crate. %license LICENSE %doc README.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ -%exclude %{cargo_registry}/%{crate}-%{version_no_tilde}/docs
%package -n %{name}+default-devel Summary: %{summary} @@ -80,18 +76,6 @@ which use "dummy_match_byte" feature of "%{crate}" crate. %files -n %{name}+dummy_match_byte-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-%package -n %{name}+heapsize-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+heapsize-devel %{_description} - -This package contains library source intended for building other packages -which use "heapsize" feature of "%{crate}" crate. - -%files -n %{name}+heapsize-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - %package -n %{name}+serde-devel Summary: %{summary} BuildArch: noarch @@ -124,6 +108,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Sat Feb 15 13:25:32 CET 2020 Igor Raits ignatenkobrain@fedoraproject.org - 0.27.2-1 +- Update to 0.27.2 + * Thu Jan 30 2020 Fedora Release Engineering releng@fedoraproject.org - 0.25.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources index 416fceb..9c8832f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.25.9.crate) = 3b13f044655f9305904429da8079ae44bf1e4836e3362057d07df4e0114ecde5abed726124389b4bb99215c62ef867f3417f00fe18b1c1d75d2cada895b14d8f +SHA512 (cssparser-0.27.2.crate) = 7ab205b05112deffb5c50586106c6f04932a8b5aa1bc3224062abfb65136884f20189ffb1b2402aca5c29cc52c3315492db5c05ac052a70ddea88eb6683df295
commit 3653164024dedbf25f13c1d053366308e9a742c5 Author: Igor Raits ignatenkobrain@fedoraproject.org Date: Wed Feb 12 10:49:41 2020 +0100
Drop tests
They do not work for quite long time.
Signed-off-by: Igor Raits ignatenkobrain@fedoraproject.org
diff --git a/tests/.fmf/version b/tests/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/tests/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/provision.fmf b/tests/provision.fmf deleted file mode 100644 index 503a97c..0000000 --- a/tests/provision.fmf +++ /dev/null @@ -1,5 +0,0 @@ ---- -standard-inventory-qcow2: - qemu: - # `cargo test` usually eats more than 1G. - m: 4G diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 8b76203..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - repositories: - - repo: "https://src.fedoraproject.org/tests/rust.git" - dest: rust - tests: - - rust/cargo-test - environment: - pkg: rust-cssparser
commit 9c13a67ea31aa708c2f978141e93f4ef7ad9977c Author: Fedora Release Engineering releng@fedoraproject.org Date: Thu Jan 30 20:16:13 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 2e84d6e..84491a6 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.25.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Rust implementation of CSS Syntax Level 3
# Upstream license specification: MPL-2.0 @@ -124,6 +124,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Thu Jan 30 2020 Fedora Release Engineering releng@fedoraproject.org - 0.25.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jan 15 2020 Josh Stone jistone@redhat.com - 0.25.9-1 - Update to 0.25.9 - Bump to autocfg 1
commit 1e53f22fd046d00bf8e7d183ce27343fa71d76e0 Author: Josh Stone jistone@redhat.com Date: Wed Jan 15 11:43:50 2020 -0800
Update to 0.25.9 Bump to autocfg 1
diff --git a/.gitignore b/.gitignore index 5f8594c..e563be1 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /cssparser-0.25.6.crate /cssparser-0.25.7.crate /cssparser-0.25.8.crate +/cssparser-0.25.9.crate diff --git a/cssparser-fix-metadata.diff b/cssparser-fix-metadata.diff new file mode 100644 index 0000000..87f249b --- /dev/null +++ b/cssparser-fix-metadata.diff @@ -0,0 +1,11 @@ +--- cssparser-0.25.9/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ cssparser-0.25.9/Cargo.toml 2020-01-15T19:38:01.535351+00:00 +@@ -59,7 +59,7 @@ + [dev-dependencies.serde_json] + version = "1.0" + [build-dependencies.autocfg] +-version = "0.1.4" ++version = "1" + + [build-dependencies.proc-macro2] + version = "1" diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 83942e2..2e84d6e 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -1,18 +1,21 @@ -# Generated by rust2rpm 10 +# Generated by rust2rpm 13 %bcond_without check %global debug_package %{nil}
%global crate cssparser
Name: rust-%{crate} -Version: 0.25.8 -Release: 2%{?dist} +Version: 0.25.9 +Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
# Upstream license specification: MPL-2.0 License: MPLv2.0 URL: https://crates.io/crates/cssparser Source: %{crates_source} +# Initial patched metadata +# * Bump to autocfg 1 +Patch0: cssparser-fix-metadata.diff
ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -38,8 +41,8 @@ which use "%{crate}" crate. %files devel %license LICENSE %doc README.md -%{cargo_registry}/%{crate}-%{version}/ -%exclude %{cargo_registry}/%{crate}-%{version}/docs +%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%exclude %{cargo_registry}/%{crate}-%{version_no_tilde}/docs
%package -n %{name}+default-devel Summary: %{summary} @@ -51,7 +54,7 @@ This package contains library source intended for building other packages which use "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%package -n %{name}+bench-devel Summary: %{summary} @@ -63,7 +66,7 @@ This package contains library source intended for building other packages which use "bench" feature of "%{crate}" crate.
%files -n %{name}+bench-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%package -n %{name}+dummy_match_byte-devel Summary: %{summary} @@ -75,7 +78,7 @@ This package contains library source intended for building other packages which use "dummy_match_byte" feature of "%{crate}" crate.
%files -n %{name}+dummy_match_byte-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%package -n %{name}+heapsize-devel Summary: %{summary} @@ -87,7 +90,7 @@ This package contains library source intended for building other packages which use "heapsize" feature of "%{crate}" crate.
%files -n %{name}+heapsize-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%package -n %{name}+serde-devel Summary: %{summary} @@ -99,7 +102,7 @@ This package contains library source intended for building other packages which use "serde" feature of "%{crate}" crate.
%files -n %{name}+serde-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -121,6 +124,10 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Wed Jan 15 2020 Josh Stone jistone@redhat.com - 0.25.9-1 +- Update to 0.25.9 +- Bump to autocfg 1 + * Fri Jul 26 2019 Fedora Release Engineering releng@fedoraproject.org - 0.25.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources index 55f5700..416fceb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.25.8.crate) = 4f1aa62472243e4b8f272b03b9dae0af40c507996f5852311847d273965936f6261c9ef28f0ea86fa72f6f0381af4c21024755b4f59410598dd25f97985ddfd6 +SHA512 (cssparser-0.25.9.crate) = 3b13f044655f9305904429da8079ae44bf1e4836e3362057d07df4e0114ecde5abed726124389b4bb99215c62ef867f3417f00fe18b1c1d75d2cada895b14d8f
commit 7288773bab7e169c865960922514f1ecd7c96f3c Author: Fedora Release Engineering releng@fedoraproject.org Date: Fri Jul 26 20:48:30 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 0d06e9d..83942e2 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.25.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Rust implementation of CSS Syntax Level 3
# Upstream license specification: MPL-2.0 @@ -121,6 +121,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Fri Jul 26 2019 Fedora Release Engineering releng@fedoraproject.org - 0.25.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Jul 07 15:05:26 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.8-1 - Update to 0.25.8
commit 17ab9dc722d7210da650bc010ccb60fdad3e1f38 Author: Igor Gnatenko ignatenkobrain@fedoraproject.org Date: Sun Jul 7 15:06:08 2019 +0200
Update to 0.25.8
Signed-off-by: Igor Gnatenko ignatenkobrain@fedoraproject.org
diff --git a/.gitignore b/.gitignore index 858b7f0..5f8594c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /cssparser-0.25.5.crate /cssparser-0.25.6.crate /cssparser-0.25.7.crate +/cssparser-0.25.8.crate diff --git a/rust-cssparser.spec b/rust-cssparser.spec index c20a021..0d06e9d 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -5,7 +5,7 @@ %global crate cssparser
Name: rust-%{crate} -Version: 0.25.7 +Version: 0.25.8 Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
@@ -121,6 +121,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Sun Jul 07 15:05:26 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.8-1 +- Update to 0.25.8 + * Sat Jul 06 11:23:45 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.7-1 - Update to 0.25.7
diff --git a/sources b/sources index cda2f29..55f5700 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.25.7.crate) = b17015c784e31d0a310922f9302c3f21b89bb10892f99c43312419fb3451e3793230b6f6c0f7197251a9e906d4f76720ceb4c49da148d9ec1a3fc51c10370df9 +SHA512 (cssparser-0.25.8.crate) = 4f1aa62472243e4b8f272b03b9dae0af40c507996f5852311847d273965936f6261c9ef28f0ea86fa72f6f0381af4c21024755b4f59410598dd25f97985ddfd6
commit 4f51979618f043e5eeb328011c2e21bcc3561af1 Author: Igor Gnatenko ignatenkobrain@fedoraproject.org Date: Sat Jul 6 11:24:19 2019 +0200
Update to 0.25.7
Signed-off-by: Igor Gnatenko ignatenkobrain@fedoraproject.org
diff --git a/.gitignore b/.gitignore index 7abbc53..858b7f0 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /cssparser-0.25.3.crate /cssparser-0.25.5.crate /cssparser-0.25.6.crate +/cssparser-0.25.7.crate diff --git a/rust-cssparser.spec b/rust-cssparser.spec index baaa150..c20a021 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 9 -%bcond_with check +# Generated by rust2rpm 10 +%bcond_without check %global debug_package %{nil}
%global crate cssparser
Name: rust-%{crate} -Version: 0.25.6 +Version: 0.25.7 Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
@@ -15,26 +15,11 @@ URL: https://crates.io/crates/cssparser Source: %{crates_source}
ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif
BuildRequires: rust-packaging -BuildRequires: (crate(cssparser-macros/default) >= 0.3.3 with crate(cssparser-macros/default) < 0.4.0) -BuildRequires: (crate(dtoa-short/default) >= 0.3.0 with crate(dtoa-short/default) < 0.4.0) -BuildRequires: (crate(itoa/default) >= 0.4.0 with crate(itoa/default) < 0.5.0) -BuildRequires: (crate(matches/default) >= 0.1.0 with crate(matches/default) < 0.2.0) -BuildRequires: (crate(phf/default) >= 0.7.0 with crate(phf/default) < 0.8.0) -BuildRequires: (crate(proc-macro2/default) >= 0.4.0 with crate(proc-macro2/default) < 0.5.0) -BuildRequires: (crate(procedural-masquerade/default) >= 0.1.0 with crate(procedural-masquerade/default) < 0.2.0) -BuildRequires: (crate(quote/default) >= 0.6.0 with crate(quote/default) < 0.7.0) -BuildRequires: (crate(smallvec/default) >= 0.6.0 with crate(smallvec/default) < 0.7.0) -BuildRequires: (crate(syn/default) >= 0.15.12 with crate(syn/default) < 0.16.0) -BuildRequires: (crate(syn/extra-traits) >= 0.15.12 with crate(syn/extra-traits) < 0.16.0) -BuildRequires: (crate(syn/fold) >= 0.15.12 with crate(syn/fold) < 0.16.0) -BuildRequires: (crate(syn/full) >= 0.15.12 with crate(syn/full) < 0.16.0) -%if %{with check} -BuildRequires: (crate(difference/default) >= 2.0.0 with crate(difference/default) < 3.0.0) -BuildRequires: (crate(encoding_rs/default) >= 0.8.0 with crate(encoding_rs/default) < 0.9.0) -BuildRequires: (crate(rustc-serialize/default) >= 0.3.0 with crate(rustc-serialize/default) < 0.4.0) -%endif
%global _description %{expand: Rust implementation of CSS Syntax Level 3.} @@ -120,6 +105,9 @@ which use "serde" feature of "%{crate}" crate. %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep
+%generate_buildrequires +%cargo_generate_buildrequires + %build %cargo_build
@@ -133,6 +121,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Sat Jul 06 11:23:45 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.7-1 +- Update to 0.25.7 + * Thu May 30 17:59:18 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.6-1 - Update to 0.25.6
diff --git a/sources b/sources index fc8fd2e..cda2f29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.25.6.crate) = 033ae8d9385d8fd974fa3756dfb9889e9f9d00b2f219979c3e0224776cbcf48c4afed86d863f131e7a8ddefee12a2b012c8857a9d95a8418cd84d643c07c0796 +SHA512 (cssparser-0.25.7.crate) = b17015c784e31d0a310922f9302c3f21b89bb10892f99c43312419fb3451e3793230b6f6c0f7197251a9e906d4f76720ceb4c49da148d9ec1a3fc51c10370df9
commit e1ce20d4da46ed7e78071345640aa79f9ef8e796 Author: Igor Gnatenko ignatenkobrain@fedoraproject.org Date: Thu May 30 18:00:01 2019 +0200
Update to 0.25.6
Signed-off-by: Igor Gnatenko ignatenkobrain@fedoraproject.org
diff --git a/.gitignore b/.gitignore index f95ec39..7abbc53 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /cssparser-0.25.2.crate /cssparser-0.25.3.crate /cssparser-0.25.5.crate +/cssparser-0.25.6.crate diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 89de8a5..baaa150 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm +# Generated by rust2rpm 9 %bcond_with check %global debug_package %{nil}
%global crate cssparser
Name: rust-%{crate} -Version: 0.25.5 +Version: 0.25.6 Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
@@ -36,8 +36,8 @@ BuildRequires: (crate(encoding_rs/default) >= 0.8.0 with crate(encoding_rs/defa BuildRequires: (crate(rustc-serialize/default) >= 0.3.0 with crate(rustc-serialize/default) < 0.4.0) %endif
-%global _description \ -Rust implementation of CSS Syntax Level 3. +%global _description %{expand: +Rust implementation of CSS Syntax Level 3.}
%description %{_description}
@@ -133,6 +133,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Thu May 30 17:59:18 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.6-1 +- Update to 0.25.6 + * Tue Apr 30 09:40:06 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.5-1 - Update to 0.25.5
diff --git a/sources b/sources index ec2956e..fc8fd2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.25.5.crate) = 082cf13decba85adb53611b9e507ed965b8d47687af2063b902e37a39ae0f1f71daf6ef9e9fbf6a4d76499971ce84cb1a6800eeb19544a1f3e616b6dc58413d5 +SHA512 (cssparser-0.25.6.crate) = 033ae8d9385d8fd974fa3756dfb9889e9f9d00b2f219979c3e0224776cbcf48c4afed86d863f131e7a8ddefee12a2b012c8857a9d95a8418cd84d643c07c0796
commit 6b7ccee5063c8d26af573e7a9076e1b5fb5c6f25 Author: Igor Gnatenko ignatenkobrain@fedoraproject.org Date: Tue Apr 30 09:40:45 2019 +0200
Update to 0.25.5
Signed-off-by: Igor Gnatenko ignatenkobrain@fedoraproject.org
diff --git a/.gitignore b/.gitignore index 71ab539..f95ec39 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /cssparser-0.24.1.crate /cssparser-0.25.2.crate /cssparser-0.25.3.crate +/cssparser-0.25.5.crate diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 9917fb5..89de8a5 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -5,7 +5,7 @@ %global crate cssparser
Name: rust-%{crate} -Version: 0.25.3 +Version: 0.25.5 Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
@@ -133,6 +133,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Tue Apr 30 09:40:06 CEST 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.5-1 +- Update to 0.25.5 + * Wed Apr 03 2019 Josh Stone jistone@redhat.com - 0.25.3-1 - Update to 0.25.3
diff --git a/sources b/sources index b041cab..ec2956e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.25.3.crate) = 6e4e0d96e284626c963477b38aad3f23e880ae3fcdb0dc1950402bb4559cd8ab32966db9423dcc77879cfc5ea1d4880f7d51cef0ac19cbfb4531ca0a26c9e8b1 +SHA512 (cssparser-0.25.5.crate) = 082cf13decba85adb53611b9e507ed965b8d47687af2063b902e37a39ae0f1f71daf6ef9e9fbf6a4d76499971ce84cb1a6800eeb19544a1f3e616b6dc58413d5
commit 418b3fdc4da963e0b3ff22a1d38bef0a8e7402e3 Author: Josh Stone jistone@redhat.com Date: Wed Apr 3 12:08:10 2019 -0700
Update to 0.25.3
diff --git a/.gitignore b/.gitignore index 07d7e30..71ab539 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /cssparser-0.24.0.crate /cssparser-0.24.1.crate /cssparser-0.25.2.crate +/cssparser-0.25.3.crate diff --git a/cssparser-fix-metadata.diff b/cssparser-fix-metadata.diff deleted file mode 100644 index 3d0d6cd..0000000 --- a/cssparser-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- cssparser-0.25.2/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ cssparser-0.25.2/Cargo.toml 2019-02-10T17:38:13.438776+01:00 -@@ -54,7 +54,7 @@ - version = "2.0" - - [dev-dependencies.encoding_rs] --version = "0.7" -+version = "0.8" - - [dev-dependencies.rustc-serialize] - version = "0.3" diff --git a/rust-cssparser.spec b/rust-cssparser.spec index b972779..9917fb5 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -5,7 +5,7 @@ %global crate cssparser
Name: rust-%{crate} -Version: 0.25.2 +Version: 0.25.3 Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
@@ -13,23 +13,18 @@ Summary: Rust implementation of CSS Syntax Level 3 License: MPLv2.0 URL: https://crates.io/crates/cssparser Source: %{crates_source} -# Initial patched metadata -# * Bump encoding_rs to 0.8, https://github.com/servo/rust-cssparser/pull/227 -Patch0: cssparser-fix-metadata.diff
ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging BuildRequires: (crate(cssparser-macros/default) >= 0.3.3 with crate(cssparser-macros/default) < 0.4.0) BuildRequires: (crate(dtoa-short/default) >= 0.3.0 with crate(dtoa-short/default) < 0.4.0) -BuildRequires: (crate(heapsize/default) >= 0.3.0 with crate(heapsize/default) < 0.5.0) BuildRequires: (crate(itoa/default) >= 0.4.0 with crate(itoa/default) < 0.5.0) BuildRequires: (crate(matches/default) >= 0.1.0 with crate(matches/default) < 0.2.0) BuildRequires: (crate(phf/default) >= 0.7.0 with crate(phf/default) < 0.8.0) BuildRequires: (crate(proc-macro2/default) >= 0.4.0 with crate(proc-macro2/default) < 0.5.0) BuildRequires: (crate(procedural-masquerade/default) >= 0.1.0 with crate(procedural-masquerade/default) < 0.2.0) BuildRequires: (crate(quote/default) >= 0.6.0 with crate(quote/default) < 0.7.0) -BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0) BuildRequires: (crate(smallvec/default) >= 0.6.0 with crate(smallvec/default) < 0.7.0) BuildRequires: (crate(syn/default) >= 0.15.12 with crate(syn/default) < 0.16.0) BuildRequires: (crate(syn/extra-traits) >= 0.15.12 with crate(syn/extra-traits) < 0.16.0) @@ -138,6 +133,9 @@ which use "serde" feature of "%{crate}" crate. %endif
%changelog +* Wed Apr 03 2019 Josh Stone jistone@redhat.com - 0.25.3-1 +- Update to 0.25.3 + * Sun Feb 10 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.2-1 - Update to 0.25.2
diff --git a/sources b/sources index 9187e8e..b041cab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.25.2.crate) = 4b40c2a68c07001769f1c8070e739b4f48ad245e5bfecc8e1b39cf0192dd437b6a70b3a645a108aa164c6ef8135a71ae99258c96555b23023d579a415d81ceec +SHA512 (cssparser-0.25.3.crate) = 6e4e0d96e284626c963477b38aad3f23e880ae3fcdb0dc1950402bb4559cd8ab32966db9423dcc77879cfc5ea1d4880f7d51cef0ac19cbfb4531ca0a26c9e8b1
commit 9cac75f12e81879de89a6fd3bd0b330f84d0f655 Author: Igor Gnatenko ignatenkobrain@fedoraproject.org Date: Sun Feb 10 17:39:00 2019 +0100
Update to 0.25.1
Signed-off-by: Igor Gnatenko ignatenkobrain@fedoraproject.org
diff --git a/.gitignore b/.gitignore index db9f140..07d7e30 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /cssparser-0.23.10.crate /cssparser-0.24.0.crate /cssparser-0.24.1.crate +/cssparser-0.25.2.crate diff --git a/cssparser-fix-metadata.diff b/cssparser-fix-metadata.diff index e3e7277..3d0d6cd 100644 --- a/cssparser-fix-metadata.diff +++ b/cssparser-fix-metadata.diff @@ -1,5 +1,5 @@ ---- cssparser-0.24.1/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ cssparser-0.24.1/Cargo.toml 2018-10-04T14:15:33.095029+02:00 +--- cssparser-0.25.2/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ cssparser-0.25.2/Cargo.toml 2019-02-10T17:38:13.438776+01:00 @@ -54,7 +54,7 @@ version = "2.0"
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 6db6738..b972779 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -1,18 +1,18 @@ # Generated by rust2rpm -%bcond_without check +%bcond_with check %global debug_package %{nil}
%global crate cssparser
Name: rust-%{crate} -Version: 0.24.1 -Release: 2%{?dist} +Version: 0.25.2 +Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
# Upstream license specification: MPL-2.0 License: MPLv2.0 URL: https://crates.io/crates/cssparser -Source0: https://crates.io/api/v1/crates/%%7Bcrate%7D/%%7Bversion%7D/download#/%%7Bcr... +Source: %{crates_source} # Initial patched metadata # * Bump encoding_rs to 0.8, https://github.com/servo/rust-cssparser/pull/227 Patch0: cssparser-fix-metadata.diff @@ -20,42 +20,109 @@ Patch0: cssparser-fix-metadata.diff ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(cssparser-macros) >= 0.3.3 with crate(cssparser-macros) < 0.4.0) -BuildRequires: (crate(dtoa-short) >= 0.3.0 with crate(dtoa-short) < 0.4.0) -BuildRequires: (crate(heapsize) >= 0.3.0 with crate(heapsize) < 0.5.0) -BuildRequires: (crate(itoa) >= 0.4.0 with crate(itoa) < 0.5.0) -BuildRequires: (crate(matches) >= 0.1.0 with crate(matches) < 0.2.0) -BuildRequires: (crate(phf) >= 0.7.0 with crate(phf) < 0.8.0) -BuildRequires: (crate(procedural-masquerade) >= 0.1.0 with crate(procedural-masquerade) < 0.2.0) -BuildRequires: (crate(serde) >= 1.0.0 with crate(serde) < 2.0.0) -BuildRequires: (crate(smallvec) >= 0.6.0 with crate(smallvec) < 0.7.0) -# [build-dependencies] -BuildRequires: (crate(proc-macro2) >= 0.4.0 with crate(proc-macro2) < 0.5.0) -BuildRequires: (crate(quote) >= 0.6.0 with crate(quote) < 0.7.0) -BuildRequires: ((crate(syn) >= 0.14.0 with crate(syn) < 0.15.0) with crate(syn/extra-traits) with crate(syn/fold) with crate(syn/full)) +BuildRequires: (crate(cssparser-macros/default) >= 0.3.3 with crate(cssparser-macros/default) < 0.4.0) +BuildRequires: (crate(dtoa-short/default) >= 0.3.0 with crate(dtoa-short/default) < 0.4.0) +BuildRequires: (crate(heapsize/default) >= 0.3.0 with crate(heapsize/default) < 0.5.0) +BuildRequires: (crate(itoa/default) >= 0.4.0 with crate(itoa/default) < 0.5.0) +BuildRequires: (crate(matches/default) >= 0.1.0 with crate(matches/default) < 0.2.0) +BuildRequires: (crate(phf/default) >= 0.7.0 with crate(phf/default) < 0.8.0) +BuildRequires: (crate(proc-macro2/default) >= 0.4.0 with crate(proc-macro2/default) < 0.5.0) +BuildRequires: (crate(procedural-masquerade/default) >= 0.1.0 with crate(procedural-masquerade/default) < 0.2.0) +BuildRequires: (crate(quote/default) >= 0.6.0 with crate(quote/default) < 0.7.0) +BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0) +BuildRequires: (crate(smallvec/default) >= 0.6.0 with crate(smallvec/default) < 0.7.0) +BuildRequires: (crate(syn/default) >= 0.15.12 with crate(syn/default) < 0.16.0) +BuildRequires: (crate(syn/extra-traits) >= 0.15.12 with crate(syn/extra-traits) < 0.16.0) +BuildRequires: (crate(syn/fold) >= 0.15.12 with crate(syn/fold) < 0.16.0) +BuildRequires: (crate(syn/full) >= 0.15.12 with crate(syn/full) < 0.16.0) %if %{with check} -# [dev-dependencies] -BuildRequires: (crate(difference) >= 2.0.0 with crate(difference) < 3.0.0) -BuildRequires: (crate(encoding_rs) >= 0.8.0 with crate(encoding_rs) < 0.9.0) -BuildRequires: (crate(rustc-serialize) >= 0.3.0 with crate(rustc-serialize) < 0.4.0) +BuildRequires: (crate(difference/default) >= 2.0.0 with crate(difference/default) < 3.0.0) +BuildRequires: (crate(encoding_rs/default) >= 0.8.0 with crate(encoding_rs/default) < 0.9.0) +BuildRequires: (crate(rustc-serialize/default) >= 0.3.0 with crate(rustc-serialize/default) < 0.4.0) %endif
-%description -%{summary}. +%global _description \ +Rust implementation of CSS Syntax Level 3. + +%description %{_description}
%package devel Summary: %{summary} BuildArch: noarch
-%description devel -Rust implementation of CSS Syntax Level 3. +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%license LICENSE +%doc README.md +%{cargo_registry}/%{crate}-%{version}/ +%exclude %{cargo_registry}/%{crate}-%{version}/docs + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description}
This package contains library source intended for building other packages -which use %{crate} from crates.io. +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+bench-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+bench-devel %{_description} + +This package contains library source intended for building other packages +which use "bench" feature of "%{crate}" crate. + +%files -n %{name}+bench-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+dummy_match_byte-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dummy_match_byte-devel %{_description} + +This package contains library source intended for building other packages +which use "dummy_match_byte" feature of "%{crate}" crate. + +%files -n %{name}+dummy_match_byte-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+heapsize-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+heapsize-devel %{_description} + +This package contains library source intended for building other packages +which use "heapsize" feature of "%{crate}" crate. + +%files -n %{name}+heapsize-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+serde-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+serde-devel %{_description} + +This package contains library source intended for building other packages +which use "serde" feature of "%{crate}" crate. + +%files -n %{name}+serde-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
%prep -%autosetup -n %{crate}-%{version} -p1 +%autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep
%build @@ -70,13 +137,10 @@ which use %{crate} from crates.io. %cargo_test -- --doc %endif
-%files devel -%license LICENSE -%doc README.md -%{cargo_registry}/%{crate}-%{version}/ -%exclude %{cargo_registry}/%{crate}-%{version}/docs - %changelog +* Sun Feb 10 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.25.2-1 +- Update to 0.25.2 + * Sat Feb 02 2019 Fedora Release Engineering releng@fedoraproject.org - 0.24.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources index 2fbe7f4..9187e8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.24.1.crate) = d7ab543e82a36d87670e6d132cd97f4f563cffeebf58ee6669bf15d0bff5a8a2790d6f598a59bb64672baf9803dd4fc093da6c1df2ae1d20d3c0425e3759a5a1 +SHA512 (cssparser-0.25.2.crate) = 4b40c2a68c07001769f1c8070e739b4f48ad245e5bfecc8e1b39cf0192dd437b6a70b3a645a108aa164c6ef8135a71ae99258c96555b23023d579a415d81ceec diff --git a/tests/.fmf/version b/tests/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/provision.fmf b/tests/provision.fmf new file mode 100644 index 0000000..503a97c --- /dev/null +++ b/tests/provision.fmf @@ -0,0 +1,5 @@ +--- +standard-inventory-qcow2: + qemu: + # `cargo test` usually eats more than 1G. + m: 4G diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..8b76203 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,13 @@ +--- +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + repositories: + - repo: "https://src.fedoraproject.org/tests/rust.git" + dest: rust + tests: + - rust/cargo-test + environment: + pkg: rust-cssparser
commit c5ac9fb690d4ee30fa9eabbb7e428918a34489e2 Author: Fedora Release Engineering releng@fedoraproject.org Date: Sat Feb 2 13:31:25 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 6a259a7..6db6738 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.24.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Rust implementation of CSS Syntax Level 3
# Upstream license specification: MPL-2.0 @@ -77,6 +77,9 @@ which use %{crate} from crates.io. %exclude %{cargo_registry}/%{crate}-%{version}/docs
%changelog +* Sat Feb 02 2019 Fedora Release Engineering releng@fedoraproject.org - 0.24.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Oct 04 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.24.1-1 - Update to 0.24.1
commit 04a9214463021af83327bbe9f5a405da81e030c7 Author: Igor Gnatenko ignatenkobrain@fedoraproject.org Date: Thu Oct 4 14:15:12 2018 +0200
Update to 0.24.1
Signed-off-by: Igor Gnatenko ignatenkobrain@fedoraproject.org
diff --git a/.gitignore b/.gitignore index 666fd2d..db9f140 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /cssparser-0.23.9.crate /cssparser-0.23.10.crate /cssparser-0.24.0.crate +/cssparser-0.24.1.crate diff --git a/cssparser-0.24.0-fix-metadata.diff b/cssparser-fix-metadata.diff similarity index 56% rename from cssparser-0.24.0-fix-metadata.diff rename to cssparser-fix-metadata.diff index 55488d6..e3e7277 100644 --- a/cssparser-0.24.0-fix-metadata.diff +++ b/cssparser-fix-metadata.diff @@ -1,5 +1,5 @@ ---- cssparser-0.24.0/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ cssparser-0.24.0/Cargo.toml 2018-07-29T08:56:37.622123+02:00 +--- cssparser-0.24.1/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ cssparser-0.24.1/Cargo.toml 2018-10-04T14:15:33.095029+02:00 @@ -54,7 +54,7 @@ version = "2.0"
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 661c23b..6a259a7 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -5,16 +5,17 @@ %global crate cssparser
Name: rust-%{crate} -Version: 0.24.0 -Release: 3%{?dist} +Version: 0.24.1 +Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
+# Upstream license specification: MPL-2.0 License: MPLv2.0 URL: https://crates.io/crates/cssparser Source0: https://crates.io/api/v1/crates/%%7Bcrate%7D/%%7Bversion%7D/download#/%%7Bcr... # Initial patched metadata -# * Bump encoding_rs to 0.8, XXX -Patch0: cssparser-0.24.0-fix-metadata.diff +# * Bump encoding_rs to 0.8, https://github.com/servo/rust-cssparser/pull/227 +Patch0: cssparser-fix-metadata.diff
ExclusiveArch: %{rust_arches}
@@ -70,9 +71,15 @@ which use %{crate} from crates.io. %endif
%files devel +%license LICENSE +%doc README.md %{cargo_registry}/%{crate}-%{version}/ +%exclude %{cargo_registry}/%{crate}-%{version}/docs
%changelog +* Thu Oct 04 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.24.1-1 +- Update to 0.24.1 + * Sun Jul 29 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.24.0-3 - Bump encoding_rs to 0.8
diff --git a/sources b/sources index f619538..2fbe7f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.24.0.crate) = 70a52cbb638d6e9865a79c7394893ad256922b895228504cfeec9f01da247eb98243507bddffd62c70e2a11dd40b74ae57c34d3144d066cfd8781a2c117c8cee +SHA512 (cssparser-0.24.1.crate) = d7ab543e82a36d87670e6d132cd97f4f563cffeebf58ee6669bf15d0bff5a8a2790d6f598a59bb64672baf9803dd4fc093da6c1df2ae1d20d3c0425e3759a5a1
commit 4a2b22b4fa624f6602d41b8bb9636f7facdcb333 Author: Igor Gnatenko ignatenkobrain@fedoraproject.org Date: Sun Jul 29 08:56:15 2018 +0200
Bump encoding_rs to 0.8
Signed-off-by: Igor Gnatenko ignatenkobrain@fedoraproject.org
diff --git a/cssparser-0.24.0-fix-metadata.diff b/cssparser-0.24.0-fix-metadata.diff new file mode 100644 index 0000000..55488d6 --- /dev/null +++ b/cssparser-0.24.0-fix-metadata.diff @@ -0,0 +1,11 @@ +--- cssparser-0.24.0/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ cssparser-0.24.0/Cargo.toml 2018-07-29T08:56:37.622123+02:00 +@@ -54,7 +54,7 @@ + version = "2.0" + + [dev-dependencies.encoding_rs] +-version = "0.7" ++version = "0.8" + + [dev-dependencies.rustc-serialize] + version = "0.3" diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 8777129..661c23b 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,12 +6,15 @@
Name: rust-%{crate} Version: 0.24.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Rust implementation of CSS Syntax Level 3
License: MPLv2.0 URL: https://crates.io/crates/cssparser Source0: https://crates.io/api/v1/crates/%%7Bcrate%7D/%%7Bversion%7D/download#/%%7Bcr... +# Initial patched metadata +# * Bump encoding_rs to 0.8, XXX +Patch0: cssparser-0.24.0-fix-metadata.diff
ExclusiveArch: %{rust_arches}
@@ -33,7 +36,7 @@ BuildRequires: ((crate(syn) >= 0.14.0 with crate(syn) < 0.15.0) with crate(syn/ %if %{with check} # [dev-dependencies] BuildRequires: (crate(difference) >= 2.0.0 with crate(difference) < 3.0.0) -BuildRequires: (crate(encoding_rs) >= 0.7.0 with crate(encoding_rs) < 0.8.0) +BuildRequires: (crate(encoding_rs) >= 0.8.0 with crate(encoding_rs) < 0.9.0) BuildRequires: (crate(rustc-serialize) >= 0.3.0 with crate(rustc-serialize) < 0.4.0) %endif
@@ -70,6 +73,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/
%changelog +* Sun Jul 29 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.24.0-3 +- Bump encoding_rs to 0.8 + * Sat Jul 14 2018 Fedora Release Engineering releng@fedoraproject.org - 0.24.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 8d5ec112ac9038457fc1c525f5c4eacdb9873133 Author: Fedora Release Engineering releng@fedoraproject.org Date: Sat Jul 14 05:03:23 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index e8b1ebe..8777129 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.24.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Rust implementation of CSS Syntax Level 3
License: MPLv2.0 @@ -70,6 +70,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/
%changelog +* Sat Jul 14 2018 Fedora Release Engineering releng@fedoraproject.org - 0.24.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat Jun 30 2018 Josh Stone jistone@redhat.com - 0.24.0-1 - Update to 0.24.0
commit 8f506defda079e618dd751b40854d6d692907208 Author: Josh Stone jistone@redhat.com Date: Sat Jun 30 00:19:23 2018 -0700
Update to 0.24.0
diff --git a/.gitignore b/.gitignore index bef5d23..666fd2d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /cssparser-0.23.7.crate /cssparser-0.23.9.crate /cssparser-0.23.10.crate +/cssparser-0.24.0.crate diff --git a/rust-cssparser.spec b/rust-cssparser.spec index fd5491e..e8b1ebe 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -5,8 +5,8 @@ %global crate cssparser
Name: rust-%{crate} -Version: 0.23.10 -Release: 2%{?dist} +Version: 0.24.0 +Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
License: MPLv2.0 @@ -27,9 +27,9 @@ BuildRequires: (crate(procedural-masquerade) >= 0.1.0 with crate(procedural-mas BuildRequires: (crate(serde) >= 1.0.0 with crate(serde) < 2.0.0) BuildRequires: (crate(smallvec) >= 0.6.0 with crate(smallvec) < 0.7.0) # [build-dependencies] -BuildRequires: (crate(proc-macro2) >= 0.3.0 with crate(proc-macro2) < 0.4.0) -BuildRequires: (crate(quote) >= 0.5.0 with crate(quote) < 0.6.0) -BuildRequires: ((crate(syn) >= 0.13.0 with crate(syn) < 0.14.0) with crate(syn/extra-traits) with crate(syn/fold)) +BuildRequires: (crate(proc-macro2) >= 0.4.0 with crate(proc-macro2) < 0.5.0) +BuildRequires: (crate(quote) >= 0.6.0 with crate(quote) < 0.7.0) +BuildRequires: ((crate(syn) >= 0.14.0 with crate(syn) < 0.15.0) with crate(syn/extra-traits) with crate(syn/fold) with crate(syn/full)) %if %{with check} # [dev-dependencies] BuildRequires: (crate(difference) >= 2.0.0 with crate(difference) < 3.0.0) @@ -70,6 +70,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/
%changelog +* Sat Jun 30 2018 Josh Stone jistone@redhat.com - 0.24.0-1 +- Update to 0.24.0 + * Sat Jun 23 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - Adopt to new macro
diff --git a/sources b/sources index b917a3d..f619538 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.23.10.crate) = 93db314c0f93e6b6a9c1148403a379215902c8bf63e0a53b495a5fd9451b2bf7c7a7570ca8651962e9bfd1be9cf5768bf03acbf35264760651a24439e0f6835a +SHA512 (cssparser-0.24.0.crate) = 70a52cbb638d6e9865a79c7394893ad256922b895228504cfeec9f01da247eb98243507bddffd62c70e2a11dd40b74ae57c34d3144d066cfd8781a2c117c8cee
commit f289cc37f4f07d139e7ad53f0d9fc02376ddc51f Author: Igor Gnatenko ignatenkobrain@fedoraproject.org Date: Sat Jun 23 06:37:39 2018 +0200
Adopt to new macro
Signed-off-by: Igor Gnatenko ignatenkobrain@fedoraproject.org
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 0e6cd71..fd5491e 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.23.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Rust implementation of CSS Syntax Level 3
License: MPLv2.0 @@ -63,13 +63,16 @@ which use %{crate} from crates.io. %if %{with check} %check # https://github.com/servo/rust-cssparser/issues/213 -%cargo_test --doc +%cargo_test -- --doc %endif
%files devel %{cargo_registry}/%{crate}-%{version}/
%changelog +* Sat Jun 23 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org +- Adopt to new macro + * Thu Jun 14 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.10-1 - Update to 0.23.10
commit 5feddbdaa00f433fc37e8e1f8fbe20edd1c22f88 Author: Igor Gnatenko ignatenkobrain@fedoraproject.org Date: Thu Jun 14 17:54:53 2018 +0200
Update to 0.23.10
Signed-off-by: Igor Gnatenko ignatenkobrain@fedoraproject.org
diff --git a/.gitignore b/.gitignore index 1862324..bef5d23 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /cssparser-0.23.6.crate /cssparser-0.23.7.crate /cssparser-0.23.9.crate +/cssparser-0.23.10.crate diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 9c4f8b3..0e6cd71 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -5,7 +5,7 @@ %global crate cssparser
Name: rust-%{crate} -Version: 0.23.9 +Version: 0.23.10 Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
@@ -70,6 +70,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/
%changelog +* Thu Jun 14 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.10-1 +- Update to 0.23.10 + * Tue Jun 05 2018 Josh Stone jistone@redhat.com - 0.23.9-1 - Update to 0.23.9
diff --git a/sources b/sources index de6acc7..b917a3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.23.9.crate) = 769c1f5189b6771eea7e3cd29212d3c04fdf4159a9dba21a09b068fb7fbf8ceb2d916bdaeb812f28f46e6f2c38a8fc794d3e16868845ada69e4fee2562ae1deb +SHA512 (cssparser-0.23.10.crate) = 93db314c0f93e6b6a9c1148403a379215902c8bf63e0a53b495a5fd9451b2bf7c7a7570ca8651962e9bfd1be9cf5768bf03acbf35264760651a24439e0f6835a
commit 5c0088c4ad0cad22db5ca56af1478cb3fa70d9df Author: Josh Stone jistone@redhat.com Date: Tue Jun 5 16:21:24 2018 -0700
Update to 0.23.9
diff --git a/.gitignore b/.gitignore index a03fcec..1862324 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /cssparser-0.23.5.crate /cssparser-0.23.6.crate /cssparser-0.23.7.crate +/cssparser-0.23.9.crate diff --git a/rust-cssparser.spec b/rust-cssparser.spec index b9ca405..9c4f8b3 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -5,7 +5,7 @@ %global crate cssparser
Name: rust-%{crate} -Version: 0.23.7 +Version: 0.23.9 Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
@@ -70,6 +70,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/
%changelog +* Tue Jun 05 2018 Josh Stone jistone@redhat.com - 0.23.9-1 +- Update to 0.23.9 + * Thu May 03 2018 Josh Stone jistone@redhat.com - 0.23.7-1 - Update to 0.23.7
diff --git a/sources b/sources index 8f05ec2..de6acc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.23.7.crate) = 1183e72787f0556ee94555f5bb6a1734761fed78040d665442daba14c55f00469039483d3cd1d8fa479510bd78e2e0fd936bfa836bd60b7a7eda6ceb8a3c93d3 +SHA512 (cssparser-0.23.9.crate) = 769c1f5189b6771eea7e3cd29212d3c04fdf4159a9dba21a09b068fb7fbf8ceb2d916bdaeb812f28f46e6f2c38a8fc794d3e16868845ada69e4fee2562ae1deb
commit 6198a722fbff469f5e1cbccbcee5967284ea053e Author: Josh Stone jistone@redhat.com Date: Wed May 2 17:18:33 2018 -0700
Update to 0.23.7
diff --git a/.gitignore b/.gitignore index 881698c..a03fcec 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /cssparser-0.23.4.crate /cssparser-0.23.5.crate /cssparser-0.23.6.crate +/cssparser-0.23.7.crate diff --git a/rust-cssparser.spec b/rust-cssparser.spec index b46b771..b9ca405 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -5,7 +5,7 @@ %global crate cssparser
Name: rust-%{crate} -Version: 0.23.6 +Version: 0.23.7 Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
@@ -70,6 +70,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/
%changelog +* Thu May 03 2018 Josh Stone jistone@redhat.com - 0.23.7-1 +- Update to 0.23.7 + * Sat Apr 28 2018 Josh Stone jistone@redhat.com - 0.23.6-1 - Update to 0.23.6
diff --git a/sources b/sources index 8ecd557..8f05ec2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.23.6.crate) = 91b943fa7bb62cec2045f713efe143a3b8f57c7ddde3e73d2273288133f7783b535c2ba22b326291f5dcfcca3c7fe1a3e1ca80e4c79d76c8f1e66f069154a1a2 +SHA512 (cssparser-0.23.7.crate) = 1183e72787f0556ee94555f5bb6a1734761fed78040d665442daba14c55f00469039483d3cd1d8fa479510bd78e2e0fd936bfa836bd60b7a7eda6ceb8a3c93d3
commit 135c4632aaaf251bc4da819fde2bbca3cceb71bb Author: Josh Stone jistone@redhat.com Date: Fri Apr 27 18:08:37 2018 -0700
Update to 0.23.6
diff --git a/.gitignore b/.gitignore index 8883b33..881698c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cssparser-0.23.2.crate /cssparser-0.23.4.crate /cssparser-0.23.5.crate +/cssparser-0.23.6.crate diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 58ace48..b46b771 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -5,7 +5,7 @@ %global crate cssparser
Name: rust-%{crate} -Version: 0.23.5 +Version: 0.23.6 Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
@@ -70,6 +70,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/
%changelog +* Sat Apr 28 2018 Josh Stone jistone@redhat.com - 0.23.6-1 +- Update to 0.23.6 + * Tue Apr 17 2018 Josh Stone jistone@redhat.com - 0.23.5-1 - Update to 0.23.5
diff --git a/sources b/sources index dd02b3b..8ecd557 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.23.5.crate) = 1353baf6ee4fc547660dd4760c34f6dd4af15ad918c84c6c777184518f6017c80c66db64353fb6aae3023772bac34b53e921595355f13fd705e5c8e6f8d9145e +SHA512 (cssparser-0.23.6.crate) = 91b943fa7bb62cec2045f713efe143a3b8f57c7ddde3e73d2273288133f7783b535c2ba22b326291f5dcfcca3c7fe1a3e1ca80e4c79d76c8f1e66f069154a1a2
commit add5886eb91f38ed225bd624609c5ad81def2f70 Author: Josh Stone jistone@redhat.com Date: Tue Apr 17 13:32:55 2018 -0700
Update to 0.23.5
diff --git a/.gitignore b/.gitignore index 9076075..8883b33 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /cssparser-0.23.2.crate /cssparser-0.23.4.crate +/cssparser-0.23.5.crate diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 57f541d..58ace48 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -5,7 +5,7 @@ %global crate cssparser
Name: rust-%{crate} -Version: 0.23.4 +Version: 0.23.5 Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
@@ -17,7 +17,7 @@ ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging # [dependencies] -BuildRequires: (crate(cssparser-macros) >= 0.3.0 with crate(cssparser-macros) < 0.4.0) +BuildRequires: (crate(cssparser-macros) >= 0.3.3 with crate(cssparser-macros) < 0.4.0) BuildRequires: (crate(dtoa-short) >= 0.3.0 with crate(dtoa-short) < 0.4.0) BuildRequires: (crate(heapsize) >= 0.3.0 with crate(heapsize) < 0.5.0) BuildRequires: (crate(itoa) >= 0.4.0 with crate(itoa) < 0.5.0) @@ -27,9 +27,9 @@ BuildRequires: (crate(procedural-masquerade) >= 0.1.0 with crate(procedural-mas BuildRequires: (crate(serde) >= 1.0.0 with crate(serde) < 2.0.0) BuildRequires: (crate(smallvec) >= 0.6.0 with crate(smallvec) < 0.7.0) # [build-dependencies] -BuildRequires: (crate(proc-macro2) >= 0.2.0 with crate(proc-macro2) < 0.3.0) -BuildRequires: (crate(quote) >= 0.4.1 with crate(quote) < 0.5.0) -BuildRequires: ((crate(syn) >= 0.12.0 with crate(syn) < 0.13.0) with crate(syn/extra-traits) with crate(syn/fold)) +BuildRequires: (crate(proc-macro2) >= 0.3.0 with crate(proc-macro2) < 0.4.0) +BuildRequires: (crate(quote) >= 0.5.0 with crate(quote) < 0.6.0) +BuildRequires: ((crate(syn) >= 0.13.0 with crate(syn) < 0.14.0) with crate(syn/extra-traits) with crate(syn/fold)) %if %{with check} # [dev-dependencies] BuildRequires: (crate(difference) >= 2.0.0 with crate(difference) < 3.0.0) @@ -70,6 +70,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/
%changelog +* Tue Apr 17 2018 Josh Stone jistone@redhat.com - 0.23.5-1 +- Update to 0.23.5 + * Wed Apr 04 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.4-1 - Update to 0.23.4
diff --git a/sources b/sources index 3bca073..dd02b3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.23.4.crate) = 3cce283fe47a9a38f4f49903cb709249a71fb1d1130b03e1826cd11f9c02bfa78e54b72fbbf35293849c89c8414b37ce520c8fd375e525a5db498a1f4ab37c07 +SHA512 (cssparser-0.23.5.crate) = 1353baf6ee4fc547660dd4760c34f6dd4af15ad918c84c6c777184518f6017c80c66db64353fb6aae3023772bac34b53e921595355f13fd705e5c8e6f8d9145e
commit a22bd9a13ba475c6bac8305c636f9dd3f5bd9d30 Author: Igor Gnatenko ignatenkobrain@fedoraproject.org Date: Wed Apr 4 10:33:11 2018 +0200
Update to 0.23.4
Signed-off-by: Igor Gnatenko ignatenkobrain@fedoraproject.org
diff --git a/.gitignore b/.gitignore index 87aec8b..9076075 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cssparser-0.23.2.crate +/cssparser-0.23.4.crate diff --git a/0001-Update-syn-to-0.12-and-quote-to-0.4.patch b/0001-Update-syn-to-0.12-and-quote-to-0.4.patch deleted file mode 100644 index ba143c0..0000000 --- a/0001-Update-syn-to-0.12-and-quote-to-0.4.patch +++ /dev/null @@ -1,428 +0,0 @@ -From a244c3c36194a90e8081a1a89bf424a3cc70294d Mon Sep 17 00:00:00 2001 -From: Bastien Orivel eijebong@bananium.fr -Date: Thu, 11 Jan 2018 13:38:20 +0100 -Subject: [PATCH] Update syn to 0.12 and quote to 0.4 - ---- - build.rs | 3 + - build/match_byte.rs | 345 +++++++++++++++++++--------------------------------- - 2 files changed, 129 insertions(+), 219 deletions(-) - -diff --git a/build.rs b/build.rs -index 5c06d29..70339f4 100644 ---- a/build.rs -+++ b/build.rs -@@ -2,8 +2,11 @@ - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -+#[macro_use] - extern crate quote; -+#[macro_use] - extern crate syn; -+extern crate proc_macro2; - - use std::env; - use std::path::Path; -diff --git a/build/match_byte.rs b/build/match_byte.rs -index 6680c67..cbf62a5 100644 ---- a/build/match_byte.rs -+++ b/build/match_byte.rs -@@ -2,83 +2,63 @@ - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - --use quote::{ToTokens, Tokens}; -+use quote::ToTokens; - use std::fs::File; - use std::io::{Read, Write}; - use std::path::Path; --use std::vec; --use std::iter; - use syn; -+use syn::fold::Fold; -+ -+use proc_macro2::TokenStream; -+ -+struct MatchByteParser { -+} - - pub fn expand(from: &Path, to: &Path) { - let mut source = String::new(); - File::open(from).unwrap().read_to_string(&mut source).unwrap(); -- let tts = syn::parse_token_trees(&source).expect("Parsing rules.rs module"); -- let mut tokens = Tokens::new(); -- tokens.append_all(expand_tts(tts)); -+ let ast = syn::parse_file(&source).expect("Parsing rules.rs module"); -+ let mut m = MatchByteParser {}; -+ let ast = m.fold_file(ast); - -- let code = tokens.to_string().replace("{ ", "{\n").replace(" }", "\n}"); -+ let code = ast.into_tokens().to_string().replace("{ ", "{\n").replace(" }", "\n}"); - File::create(to).unwrap().write_all(code.as_bytes()).unwrap(); - } - --fn expand_tts(tts: Vecsyn::TokenTree) -> Vecsyn::TokenTree { -- use syn::*; -- let mut expanded = Vec::new(); -- let mut tts = tts.into_iter(); -- while let Some(tt) = tts.next() { -- match tt { -- TokenTree::Token(Token::Ident(ident)) => { -- if ident != "match_byte" { -- expanded.push(TokenTree::Token(Token::Ident(ident))); -- continue; -- } -- -- match tts.next() { -- Some(TokenTree::Token(Token::Not)) => {}, -- other => { -- expanded.push(TokenTree::Token(Token::Ident(ident))); -- if let Some(other) = other { -- expanded.push(other); -- } -- continue; -- } -- } -- -- let tts = match tts.next() { -- Some(TokenTree::Delimited(Delimited { tts, .. })) => tts, -- other => { -- expanded.push(TokenTree::Token(Token::Ident(ident))); -- expanded.push(TokenTree::Token(Token::Not)); -- if let Some(other) = other { -- expanded.push(other); -- } -- continue; -- } -- }; -+struct MatchByte { -+ expr: syn::Expr, -+ arms: Vecsyn::Arm, -+} - -- let (to_be_matched, table, cases, wildcard_binding) = parse_match_bytes_macro(tts); -- let expr = expand_match_bytes_macro(to_be_matched, -- &table, -- cases, -- wildcard_binding); -+impl syn::synom::Synom for MatchByte { -+ named!(parse -> Self, do_parse!( -+ expr: syn!(syn::Expr) >> -+ punct!(,) >> -+ arms: many0!(syn!(syn::Arm)) >> ( -+ MatchByte { -+ expr, -+ arms -+ } -+ ) -+ )); -+} - -- let tts = syn::parse_token_trees(&expr) -- .expect("parsing macro expansion as token trees"); -- expanded.extend(expand_tts(tts)); -+fn get_byte_from_expr_lit(expr: &Boxsyn::Expr) -> u8 { -+ match **expr { -+ syn::Expr::Lit(syn::ExprLit { ref lit, .. }) => { -+ if let syn::Lit::Byte(ref byte) = *lit { -+ byte.value() - } -- TokenTree::Delimited(Delimited { delim, tts }) => { -- expanded.push(TokenTree::Delimited(Delimited { -- delim: delim, -- tts: expand_tts(tts), -- })) -+ else { -+ panic!("Found a pattern that wasn't a byte") - } -- other => expanded.push(other), -- } -+ }, -+ _ => unreachable!(), - } -- expanded - } - --/// Parses a token tree corresponding to the `match_byte` macro. -+ -+/// Expand a TokenStream corresponding to the `match_byte` macro. - /// - /// ## Example - /// -@@ -88,184 +68,111 @@ fn expand_tts(tts: Vecsyn::TokenTree) -> Vecsyn::TokenTree { - /// b'0'..b'9' => { ... } - /// b'\n' | b'\' => { ... } - /// foo => { ... } --/// } --/// --/// Returns: --/// * The token tree that contains the expression to be matched (in this case --/// `tokenizer.next_byte_unchecked()`. -+/// } -+/// ``` - /// --/// * The table with the different cases per byte, each entry in the table --/// contains a non-zero integer representing a different arm of the --/// match expression. --/// --/// * The list of cases containing the expansion of the arms of the match --/// expression. --/// --/// * An optional identifier to which the wildcard pattern is matched (`foo` in --/// this case). --/// --fn parse_match_bytes_macro(tts: Vecsyn::TokenTree) -> (Vecsyn::TokenTree, [u8; 256], Vec<Case>, Optionsyn::Ident) { -- let mut tts = tts.into_iter(); -- -- // Grab the thing we're matching, until we find a comma. -- let mut left_hand_side = vec![]; -- loop { -- match tts.next() { -- Some(syn::TokenTree::Token(syn::Token::Comma)) => break, -- Some(other) => left_hand_side.push(other), -- None => panic!("Expected not to run out of tokens looking for a comma"), -- } -- } -- -- let mut cases = vec![]; -+fn expand_match_byte(body: &TokenStream) -> syn::Expr { -+ let match_byte: MatchByte = syn::parse2(body.clone()).unwrap(); -+ let expr = match_byte.expr; -+ let mut cases = Vec::new(); - let mut table = [0u8; 256]; -- -- let mut tts = tts.peekable(); -- let mut case_id: u8 = 1; -- let mut binding = None; -- while tts.len() > 0 { -- cases.push(parse_case(&mut tts, &mut table, &mut binding, case_id)); -- -- // Allow an optional comma between cases. -- match tts.peek() { -- Some(&syn::TokenTree::Token(syn::Token::Comma)) => { -- tts.next(); -- }, -- _ => {}, -- } -- -- case_id += 1; -- } -- -- (left_hand_side, table, cases, binding) --} -- --#[derive(Debug)] --struct Case(Vecsyn::TokenTree); -- --/// Parses a single pattern => expression, and returns the case, filling in the --/// table with the case id for every byte that matched. --/// --/// The `binding` parameter is the identifier that is used by the wildcard --/// pattern. --fn parse_case(tts: &mut iter::Peekable<vec::IntoItersyn::TokenTree>, -- table: &mut [u8; 256], -- binding: &mut Optionsyn::Ident, -- case_id: u8) -- -> Case { -- // The last byte checked, as part of this pattern, to properly detect -- // ranges. -- let mut last_byte: Option<u8> = None; -- -- // Loop through the pattern filling with bytes the table. -- loop { -- match tts.next() { -- Some(syn::TokenTree::Token(syn::Token::Literal(syn::Lit::Byte(byte)))) => { -- table[byte as usize] = case_id; -- last_byte = Some(byte); -- } -- Some(syn::TokenTree::Token(syn::Token::BinOp(syn::BinOpToken::Or))) => { -- last_byte = None; // This pattern is over. -- }, -- Some(syn::TokenTree::Token(syn::Token::DotDotDot)) => { -- assert!(last_byte.is_some(), "Expected closed range!"); -- match tts.next() { -- Some(syn::TokenTree::Token(syn::Token::Literal(syn::Lit::Byte(byte)))) => { -- for b in last_byte.take().unwrap()..byte { -- if table[b as usize] == 0 { -- table[b as usize] = case_id; -- } -+ let mut match_body = Vec::new(); -+ let mut wildcard = None; -+ -+ for (i, ref arm) in match_byte.arms.iter().enumerate() { -+ let case_id = i + 1; -+ let index = case_id as isize; -+ let name = syn::Ident::from(format!("Case{}", case_id)); -+ -+ for pat in &arm.pats { -+ match pat { -+ &syn::Pat::Lit(syn::PatLit{ref expr}) => { -+ let value = get_byte_from_expr_lit(expr); -+ if table[value as usize] == 0 { -+ table[value as usize] = case_id as u8; -+ } -+ }, -+ &syn::Pat::Range(syn::PatRange { ref lo, ref hi, .. }) => { -+ let lo = get_byte_from_expr_lit(lo); -+ let hi = get_byte_from_expr_lit(hi); -+ for value in lo..hi { -+ if table[value as usize] == 0 { -+ table[value as usize] = case_id as u8; - } -- if table[byte as usize] == 0 { -- table[byte as usize] = case_id; -+ } -+ if table[hi as usize] == 0 { -+ table[hi as usize] = case_id as u8; -+ } -+ }, -+ &syn::Pat::Wild(_) => { -+ for byte in table.iter_mut() { -+ if *byte == 0 { -+ *byte = case_id as u8; - } - } -- other => panic!("Expected closed range, got: {:?}", other), -- } -- }, -- Some(syn::TokenTree::Token(syn::Token::FatArrow)) => break, -- Some(syn::TokenTree::Token(syn::Token::Ident(ident))) => { -- assert_eq!(last_byte, None, "I don't support ranges with identifiers!"); -- assert_eq!(*binding, None); -- for byte in table.iter_mut() { -- if *byte == 0 { -- *byte = case_id; -+ }, -+ &syn::Pat::Ident(syn::PatIdent { ident, .. }) => { -+ assert_eq!(wildcard, None); -+ wildcard = Some(ident); -+ for byte in table.iter_mut() { -+ if *byte == 0 { -+ *byte = case_id as u8; -+ } - } -+ }, -+ _ => { -+ panic!("Unexpected pattern: {:?}. Buggy code ?", pat); - } -- *binding = Some(ident) - } -- Some(syn::TokenTree::Token(syn::Token::Underscore)) => { -- assert_eq!(last_byte, None); -- for byte in table.iter_mut() { -- if *byte == 0 { -- *byte = case_id; -- } -- } -- }, -- other => panic!("Expected literal byte, got: {:?}", other), -- } -- } -- -- match tts.next() { -- Some(syn::TokenTree::Delimited(syn::Delimited { delim: syn::DelimToken::Brace, tts })) => { -- Case(tts) - } -- other => panic!("Expected case with braces after fat arrow, got: {:?}", other), -- } --} -- --fn expand_match_bytes_macro(to_be_matched: Vecsyn::TokenTree, -- table: &[u8; 256], -- cases: Vec<Case>, -- binding: Optionsyn::Ident) -- -> String { -- use std::fmt::Write; -- -- assert!(!to_be_matched.is_empty()); -- assert!(table.iter().all(|b| *b != 0), "Incomplete pattern? Bogus code!"); -- -- // We build the expression with text since it's easier. -- let mut expr = "{\n".to_owned(); -- expr.push_str("enum Case {\n"); -- for (i, _) in cases.iter().enumerate() { -- write!(&mut expr, "Case{} = {},", i + 1, i + 1).unwrap(); -+ cases.push(quote!(#name = #index)); -+ let body = &arm.body; -+ match_body.push(quote!(Case::#name => { #body })) - } -- expr.push_str("}\n"); // enum Case -- -- expr.push_str("static __CASES: [Case; 256] = ["); -- for byte in table.iter() { -- write!(&mut expr, "Case::Case{}, ", *byte).unwrap(); -+ let en = quote!(enum Case { -+ #(#cases),* -+ }); -+ -+ let mut table_content = Vec::new(); -+ for entry in table.iter() { -+ let name: syn::Path = syn::parse_str(&format!("Case::Case{}", entry)).unwrap(); -+ table_content.push(name); - } -- expr.push_str("];\n"); -+ let table = quote!(static __CASES: [Case; 256] = [#(#table_content),*];); - -- let mut tokens = Tokens::new(); -- let to_be_matched = syn::Delimited { -- delim: if binding.is_some() { syn::DelimToken::Brace } else { syn::DelimToken::Paren }, -- tts: to_be_matched -+ let expr = if let Some(binding) = wildcard { -+ quote!({ #en #table let #binding = #expr; match __CASES[#binding as usize] { #(#match_body),* }}) -+ } else { -+ quote!({ #en #table match __CASES[#expr as usize] { #(#match_body),* }}) - }; -- to_be_matched.to_tokens(&mut tokens); - -- if let Some(ref binding) = binding { -- write!(&mut expr, "let {} = {};\n", binding.to_string(), tokens.as_str()).unwrap(); -- } -+ syn::parse2(expr.into()).unwrap() -+} - -- write!(&mut expr, "match __CASES[{} as usize] {{", match binding { -- Some(binding) => binding.to_string(), -- None => tokens.to_string(), -- }).unwrap(); -+impl Fold for MatchByteParser { -+ fn fold_stmt(&mut self, stmt: syn::Stmt) -> syn::Stmt { -+ match stmt { -+ syn::Stmt::Item(syn::Item::Macro(syn::ItemMacro{ ref mac, .. })) => { -+ if mac.path == parse_quote!(match_byte) { -+ return syn::fold::fold_stmt(self, syn::Stmt::Expr(expand_match_byte(&mac.tts))) -+ } -+ }, -+ _ => {} -+ } - -- for (i, case) in cases.into_iter().enumerate() { -- let mut case_tokens = Tokens::new(); -- let case = syn::Delimited { -- delim: syn::DelimToken::Brace, -- tts: case.0 -- }; -- case.to_tokens(&mut case_tokens); -- write!(&mut expr, "Case::Case{} => {},\n", i + 1, case_tokens.as_str()).unwrap(); -+ syn::fold::fold_stmt(self, stmt) - } -- expr.push_str("}\n"); // match - -- expr.push_str("}\n"); // top -+ fn fold_expr(&mut self, expr: syn::Expr) -> syn::Expr { -+ match expr { -+ syn::Expr::Macro(syn::ExprMacro{ ref mac, .. }) => { -+ if mac.path == parse_quote!(match_byte) { -+ return syn::fold::fold_expr(self, expand_match_byte(&mac.tts)) -+ } -+ }, -+ _ => {} -+ } - -- expr -+ syn::fold::fold_expr(self, expr) -+ } - } --- -2.16.2 - diff --git a/cssparser-0.23.2-fix-metadata.diff b/cssparser-0.23.2-fix-metadata.diff deleted file mode 100644 index 433bd76..0000000 --- a/cssparser-0.23.2-fix-metadata.diff +++ /dev/null @@ -1,37 +0,0 @@ ---- cssparser-0.23.2/Cargo.toml 1969-12-31T16:00:00-08:00 -+++ cssparser-0.23.2/Cargo.toml 2018-03-26T16:53:08.967126-07:00 -@@ -33,7 +33,7 @@ - optional = true - - [dependencies.itoa] --version = "0.3" -+version = "0.4" - - [dependencies.matches] - version = "0.1" -@@ -51,7 +51,7 @@ - [dependencies.smallvec] - version = "0.6" - [dev-dependencies.difference] --version = "1.0" -+version = "2.0" - - [dev-dependencies.encoding_rs] - version = "0.7" -@@ -59,10 +59,14 @@ - [dev-dependencies.rustc-serialize] - version = "0.3" - [build-dependencies.quote] --version = "0.3" -+version = "0.4.1" -+ -+[build-dependencies.proc-macro2] -+version = "0.2" - - [build-dependencies.syn] --version = "0.11" -+version = "0.12" -+features = ["extra-traits", "fold"] - - [features] - bench = [] diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 5bbe38e..57f541d 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -5,19 +5,13 @@ %global crate cssparser
Name: rust-%{crate} -Version: 0.23.2 -Release: 4%{?dist} +Version: 0.23.4 +Release: 1%{?dist} Summary: Rust implementation of CSS Syntax Level 3
License: MPLv2.0 URL: https://crates.io/crates/cssparser Source0: https://crates.io/api/v1/crates/%%7Bcrate%7D/%%7Bversion%7D/download#/%%7Bcr... -# Initial patched metadata -# * Bump difference to 2.0, https://github.com/servo/rust-cssparser/pull/212 -# * Bump syn to 0.12, quote to 0.4, https://github.com/servo/rust-cssparser/commit/a244c3c36194a90e8081a1a89bf42... -# * Bump itoa to 0.4, https://github.com/servo/rust-cssparser/pull/216 -Patch0: cssparser-0.23.2-fix-metadata.diff -Patch1: 0001-Update-syn-to-0.12-and-quote-to-0.4.patch
ExclusiveArch: %{rust_arches}
@@ -76,6 +70,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/
%changelog +* Wed Apr 04 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.4-1 +- Update to 0.23.4 + * Mon Mar 26 2018 Josh Stone jistone@redhat.com - 0.23.2-4 - Bump itoa to 0.4.0
diff --git a/sources b/sources index 639990d..3bca073 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssparser-0.23.2.crate) = 53d03959883a27143cf1447880ea2f3ed10580091b831e1e3d1c0726a7e4b82494849022dcc25e4c0aa60286dc573daf7c43986e7e0de651e9b98596db5c33c3 +SHA512 (cssparser-0.23.4.crate) = 3cce283fe47a9a38f4f49903cb709249a71fb1d1130b03e1826cd11f9c02bfa78e54b72fbbf35293849c89c8414b37ce520c8fd375e525a5db498a1f4ab37c07
commit 72071002c648c8e160023472af2d3fbdce77be89 Author: Josh Stone jistone@redhat.com Date: Mon Mar 26 17:06:38 2018 -0700
Bump itoa to 0.4.0
diff --git a/cssparser-0.23.2-fix-metadata.diff b/cssparser-0.23.2-fix-metadata.diff index a83fd03..433bd76 100644 --- a/cssparser-0.23.2-fix-metadata.diff +++ b/cssparser-0.23.2-fix-metadata.diff @@ -1,5 +1,14 @@ ---- cssparser-0.23.2/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ cssparser-0.23.2/Cargo.toml 2018-03-09T13:36:43.388490+01:00 +--- cssparser-0.23.2/Cargo.toml 1969-12-31T16:00:00-08:00 ++++ cssparser-0.23.2/Cargo.toml 2018-03-26T16:53:08.967126-07:00 +@@ -33,7 +33,7 @@ + optional = true + + [dependencies.itoa] +-version = "0.3" ++version = "0.4" + + [dependencies.matches] + version = "0.1" @@ -51,7 +51,7 @@ [dependencies.smallvec] version = "0.6" diff --git a/rust-cssparser.spec b/rust-cssparser.spec index 45def58..5bbe38e 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.23.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Rust implementation of CSS Syntax Level 3
License: MPLv2.0 @@ -15,6 +15,7 @@ Source0: https://crates.io/api/v1/crates/%%7Bcrate%7D/%%7Bversion%7D/download#/%%7B # Initial patched metadata # * Bump difference to 2.0, https://github.com/servo/rust-cssparser/pull/212 # * Bump syn to 0.12, quote to 0.4, https://github.com/servo/rust-cssparser/commit/a244c3c36194a90e8081a1a89bf42... +# * Bump itoa to 0.4, https://github.com/servo/rust-cssparser/pull/216 Patch0: cssparser-0.23.2-fix-metadata.diff Patch1: 0001-Update-syn-to-0.12-and-quote-to-0.4.patch
@@ -25,7 +26,7 @@ BuildRequires: rust-packaging BuildRequires: (crate(cssparser-macros) >= 0.3.0 with crate(cssparser-macros) < 0.4.0) BuildRequires: (crate(dtoa-short) >= 0.3.0 with crate(dtoa-short) < 0.4.0) BuildRequires: (crate(heapsize) >= 0.3.0 with crate(heapsize) < 0.5.0) -BuildRequires: (crate(itoa) >= 0.3.0 with crate(itoa) < 0.4.0) +BuildRequires: (crate(itoa) >= 0.4.0 with crate(itoa) < 0.5.0) BuildRequires: (crate(matches) >= 0.1.0 with crate(matches) < 0.2.0) BuildRequires: (crate(phf) >= 0.7.0 with crate(phf) < 0.8.0) BuildRequires: (crate(procedural-masquerade) >= 0.1.0 with crate(procedural-masquerade) < 0.2.0) @@ -75,6 +76,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/
%changelog +* Mon Mar 26 2018 Josh Stone jistone@redhat.com - 0.23.2-4 +- Bump itoa to 0.4.0 + * Fri Mar 09 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.2-3 - Bump syn to 0.12, quote to 0.4
commit 61b72a2d4b2bcbd41bcf449aa7749020c90cfc72 Author: Igor Gnatenko ignatenkobrain@fedoraproject.org Date: Fri Mar 9 13:33:25 2018 +0100
Bump syn to 0.12, quote to 0.4
Signed-off-by: Igor Gnatenko ignatenkobrain@fedoraproject.org
diff --git a/0001-Update-syn-to-0.12-and-quote-to-0.4.patch b/0001-Update-syn-to-0.12-and-quote-to-0.4.patch new file mode 100644 index 0000000..ba143c0 --- /dev/null +++ b/0001-Update-syn-to-0.12-and-quote-to-0.4.patch @@ -0,0 +1,428 @@ +From a244c3c36194a90e8081a1a89bf424a3cc70294d Mon Sep 17 00:00:00 2001 +From: Bastien Orivel eijebong@bananium.fr +Date: Thu, 11 Jan 2018 13:38:20 +0100 +Subject: [PATCH] Update syn to 0.12 and quote to 0.4 + +--- + build.rs | 3 + + build/match_byte.rs | 345 +++++++++++++++++++--------------------------------- + 2 files changed, 129 insertions(+), 219 deletions(-) + +diff --git a/build.rs b/build.rs +index 5c06d29..70339f4 100644 +--- a/build.rs ++++ b/build.rs +@@ -2,8 +2,11 @@ + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + ++#[macro_use] + extern crate quote; ++#[macro_use] + extern crate syn; ++extern crate proc_macro2; + + use std::env; + use std::path::Path; +diff --git a/build/match_byte.rs b/build/match_byte.rs +index 6680c67..cbf62a5 100644 +--- a/build/match_byte.rs ++++ b/build/match_byte.rs +@@ -2,83 +2,63 @@ + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +-use quote::{ToTokens, Tokens}; ++use quote::ToTokens; + use std::fs::File; + use std::io::{Read, Write}; + use std::path::Path; +-use std::vec; +-use std::iter; + use syn; ++use syn::fold::Fold; ++ ++use proc_macro2::TokenStream; ++ ++struct MatchByteParser { ++} + + pub fn expand(from: &Path, to: &Path) { + let mut source = String::new(); + File::open(from).unwrap().read_to_string(&mut source).unwrap(); +- let tts = syn::parse_token_trees(&source).expect("Parsing rules.rs module"); +- let mut tokens = Tokens::new(); +- tokens.append_all(expand_tts(tts)); ++ let ast = syn::parse_file(&source).expect("Parsing rules.rs module"); ++ let mut m = MatchByteParser {}; ++ let ast = m.fold_file(ast); + +- let code = tokens.to_string().replace("{ ", "{\n").replace(" }", "\n}"); ++ let code = ast.into_tokens().to_string().replace("{ ", "{\n").replace(" }", "\n}"); + File::create(to).unwrap().write_all(code.as_bytes()).unwrap(); + } + +-fn expand_tts(tts: Vecsyn::TokenTree) -> Vecsyn::TokenTree { +- use syn::*; +- let mut expanded = Vec::new(); +- let mut tts = tts.into_iter(); +- while let Some(tt) = tts.next() { +- match tt { +- TokenTree::Token(Token::Ident(ident)) => { +- if ident != "match_byte" { +- expanded.push(TokenTree::Token(Token::Ident(ident))); +- continue; +- } +- +- match tts.next() { +- Some(TokenTree::Token(Token::Not)) => {}, +- other => { +- expanded.push(TokenTree::Token(Token::Ident(ident))); +- if let Some(other) = other { +- expanded.push(other); +- } +- continue; +- } +- } +- +- let tts = match tts.next() { +- Some(TokenTree::Delimited(Delimited { tts, .. })) => tts, +- other => { +- expanded.push(TokenTree::Token(Token::Ident(ident))); +- expanded.push(TokenTree::Token(Token::Not)); +- if let Some(other) = other { +- expanded.push(other); +- } +- continue; +- } +- }; ++struct MatchByte { ++ expr: syn::Expr, ++ arms: Vecsyn::Arm, ++} + +- let (to_be_matched, table, cases, wildcard_binding) = parse_match_bytes_macro(tts); +- let expr = expand_match_bytes_macro(to_be_matched, +- &table, +- cases, +- wildcard_binding); ++impl syn::synom::Synom for MatchByte { ++ named!(parse -> Self, do_parse!( ++ expr: syn!(syn::Expr) >> ++ punct!(,) >> ++ arms: many0!(syn!(syn::Arm)) >> ( ++ MatchByte { ++ expr, ++ arms ++ } ++ ) ++ )); ++} + +- let tts = syn::parse_token_trees(&expr) +- .expect("parsing macro expansion as token trees"); +- expanded.extend(expand_tts(tts)); ++fn get_byte_from_expr_lit(expr: &Boxsyn::Expr) -> u8 { ++ match **expr { ++ syn::Expr::Lit(syn::ExprLit { ref lit, .. }) => { ++ if let syn::Lit::Byte(ref byte) = *lit { ++ byte.value() + } +- TokenTree::Delimited(Delimited { delim, tts }) => { +- expanded.push(TokenTree::Delimited(Delimited { +- delim: delim, +- tts: expand_tts(tts), +- })) ++ else { ++ panic!("Found a pattern that wasn't a byte") + } +- other => expanded.push(other), +- } ++ }, ++ _ => unreachable!(), + } +- expanded + } + +-/// Parses a token tree corresponding to the `match_byte` macro. ++ ++/// Expand a TokenStream corresponding to the `match_byte` macro. + /// + /// ## Example + /// +@@ -88,184 +68,111 @@ fn expand_tts(tts: Vecsyn::TokenTree) -> Vecsyn::TokenTree { + /// b'0'..b'9' => { ... } + /// b'\n' | b'\' => { ... } + /// foo => { ... } +-/// } +-/// +-/// Returns: +-/// * The token tree that contains the expression to be matched (in this case +-/// `tokenizer.next_byte_unchecked()`. ++/// } ++/// ``` + /// +-/// * The table with the different cases per byte, each entry in the table +-/// contains a non-zero integer representing a different arm of the +-/// match expression. +-/// +-/// * The list of cases containing the expansion of the arms of the match +-/// expression. +-/// +-/// * An optional identifier to which the wildcard pattern is matched (`foo` in +-/// this case). +-/// +-fn parse_match_bytes_macro(tts: Vecsyn::TokenTree) -> (Vecsyn::TokenTree, [u8; 256], Vec<Case>, Optionsyn::Ident) { +- let mut tts = tts.into_iter(); +- +- // Grab the thing we're matching, until we find a comma. +- let mut left_hand_side = vec![]; +- loop { +- match tts.next() { +- Some(syn::TokenTree::Token(syn::Token::Comma)) => break, +- Some(other) => left_hand_side.push(other), +- None => panic!("Expected not to run out of tokens looking for a comma"), +- } +- } +- +- let mut cases = vec![]; ++fn expand_match_byte(body: &TokenStream) -> syn::Expr { ++ let match_byte: MatchByte = syn::parse2(body.clone()).unwrap(); ++ let expr = match_byte.expr; ++ let mut cases = Vec::new(); + let mut table = [0u8; 256]; +- +- let mut tts = tts.peekable(); +- let mut case_id: u8 = 1; +- let mut binding = None; +- while tts.len() > 0 { +- cases.push(parse_case(&mut tts, &mut table, &mut binding, case_id)); +- +- // Allow an optional comma between cases. +- match tts.peek() { +- Some(&syn::TokenTree::Token(syn::Token::Comma)) => { +- tts.next(); +- }, +- _ => {}, +- } +- +- case_id += 1; +- } +- +- (left_hand_side, table, cases, binding) +-} +- +-#[derive(Debug)] +-struct Case(Vecsyn::TokenTree); +- +-/// Parses a single pattern => expression, and returns the case, filling in the +-/// table with the case id for every byte that matched. +-/// +-/// The `binding` parameter is the identifier that is used by the wildcard +-/// pattern. +-fn parse_case(tts: &mut iter::Peekable<vec::IntoItersyn::TokenTree>, +- table: &mut [u8; 256], +- binding: &mut Optionsyn::Ident, +- case_id: u8) +- -> Case { +- // The last byte checked, as part of this pattern, to properly detect +- // ranges. +- let mut last_byte: Option<u8> = None; +- +- // Loop through the pattern filling with bytes the table. +- loop { +- match tts.next() { +- Some(syn::TokenTree::Token(syn::Token::Literal(syn::Lit::Byte(byte)))) => { +- table[byte as usize] = case_id; +- last_byte = Some(byte); +- } +- Some(syn::TokenTree::Token(syn::Token::BinOp(syn::BinOpToken::Or))) => { +- last_byte = None; // This pattern is over. +- }, +- Some(syn::TokenTree::Token(syn::Token::DotDotDot)) => { +- assert!(last_byte.is_some(), "Expected closed range!"); +- match tts.next() { +- Some(syn::TokenTree::Token(syn::Token::Literal(syn::Lit::Byte(byte)))) => { +- for b in last_byte.take().unwrap()..byte { +- if table[b as usize] == 0 { +- table[b as usize] = case_id; +- } ++ let mut match_body = Vec::new(); ++ let mut wildcard = None; ++ ++ for (i, ref arm) in match_byte.arms.iter().enumerate() { ++ let case_id = i + 1; ++ let index = case_id as isize; ++ let name = syn::Ident::from(format!("Case{}", case_id)); ++ ++ for pat in &arm.pats { ++ match pat { ++ &syn::Pat::Lit(syn::PatLit{ref expr}) => { ++ let value = get_byte_from_expr_lit(expr); ++ if table[value as usize] == 0 { ++ table[value as usize] = case_id as u8; ++ } ++ }, ++ &syn::Pat::Range(syn::PatRange { ref lo, ref hi, .. }) => { ++ let lo = get_byte_from_expr_lit(lo); ++ let hi = get_byte_from_expr_lit(hi); ++ for value in lo..hi { ++ if table[value as usize] == 0 { ++ table[value as usize] = case_id as u8; + } +- if table[byte as usize] == 0 { +- table[byte as usize] = case_id; ++ } ++ if table[hi as usize] == 0 { ++ table[hi as usize] = case_id as u8; ++ } ++ }, ++ &syn::Pat::Wild(_) => { ++ for byte in table.iter_mut() { ++ if *byte == 0 { ++ *byte = case_id as u8; + } + } +- other => panic!("Expected closed range, got: {:?}", other), +- } +- }, +- Some(syn::TokenTree::Token(syn::Token::FatArrow)) => break, +- Some(syn::TokenTree::Token(syn::Token::Ident(ident))) => { +- assert_eq!(last_byte, None, "I don't support ranges with identifiers!"); +- assert_eq!(*binding, None); +- for byte in table.iter_mut() { +- if *byte == 0 { +- *byte = case_id; ++ }, ++ &syn::Pat::Ident(syn::PatIdent { ident, .. }) => { ++ assert_eq!(wildcard, None); ++ wildcard = Some(ident); ++ for byte in table.iter_mut() { ++ if *byte == 0 { ++ *byte = case_id as u8; ++ } + } ++ }, ++ _ => { ++ panic!("Unexpected pattern: {:?}. Buggy code ?", pat); + } +- *binding = Some(ident) + } +- Some(syn::TokenTree::Token(syn::Token::Underscore)) => { +- assert_eq!(last_byte, None); +- for byte in table.iter_mut() { +- if *byte == 0 { +- *byte = case_id; +- } +- } +- }, +- other => panic!("Expected literal byte, got: {:?}", other), +- } +- } +- +- match tts.next() { +- Some(syn::TokenTree::Delimited(syn::Delimited { delim: syn::DelimToken::Brace, tts })) => { +- Case(tts) + } +- other => panic!("Expected case with braces after fat arrow, got: {:?}", other), +- } +-} +- +-fn expand_match_bytes_macro(to_be_matched: Vecsyn::TokenTree, +- table: &[u8; 256], +- cases: Vec<Case>, +- binding: Optionsyn::Ident) +- -> String { +- use std::fmt::Write; +- +- assert!(!to_be_matched.is_empty()); +- assert!(table.iter().all(|b| *b != 0), "Incomplete pattern? Bogus code!"); +- +- // We build the expression with text since it's easier. +- let mut expr = "{\n".to_owned(); +- expr.push_str("enum Case {\n"); +- for (i, _) in cases.iter().enumerate() { +- write!(&mut expr, "Case{} = {},", i + 1, i + 1).unwrap(); ++ cases.push(quote!(#name = #index)); ++ let body = &arm.body; ++ match_body.push(quote!(Case::#name => { #body })) + } +- expr.push_str("}\n"); // enum Case +- +- expr.push_str("static __CASES: [Case; 256] = ["); +- for byte in table.iter() { +- write!(&mut expr, "Case::Case{}, ", *byte).unwrap(); ++ let en = quote!(enum Case { ++ #(#cases),* ++ }); ++ ++ let mut table_content = Vec::new(); ++ for entry in table.iter() { ++ let name: syn::Path = syn::parse_str(&format!("Case::Case{}", entry)).unwrap(); ++ table_content.push(name); + } +- expr.push_str("];\n"); ++ let table = quote!(static __CASES: [Case; 256] = [#(#table_content),*];); + +- let mut tokens = Tokens::new(); +- let to_be_matched = syn::Delimited { +- delim: if binding.is_some() { syn::DelimToken::Brace } else { syn::DelimToken::Paren }, +- tts: to_be_matched ++ let expr = if let Some(binding) = wildcard { ++ quote!({ #en #table let #binding = #expr; match __CASES[#binding as usize] { #(#match_body),* }}) ++ } else { ++ quote!({ #en #table match __CASES[#expr as usize] { #(#match_body),* }}) + }; +- to_be_matched.to_tokens(&mut tokens); + +- if let Some(ref binding) = binding { +- write!(&mut expr, "let {} = {};\n", binding.to_string(), tokens.as_str()).unwrap(); +- } ++ syn::parse2(expr.into()).unwrap() ++} + +- write!(&mut expr, "match __CASES[{} as usize] {{", match binding { +- Some(binding) => binding.to_string(), +- None => tokens.to_string(), +- }).unwrap(); ++impl Fold for MatchByteParser { ++ fn fold_stmt(&mut self, stmt: syn::Stmt) -> syn::Stmt { ++ match stmt { ++ syn::Stmt::Item(syn::Item::Macro(syn::ItemMacro{ ref mac, .. })) => { ++ if mac.path == parse_quote!(match_byte) { ++ return syn::fold::fold_stmt(self, syn::Stmt::Expr(expand_match_byte(&mac.tts))) ++ } ++ }, ++ _ => {} ++ } + +- for (i, case) in cases.into_iter().enumerate() { +- let mut case_tokens = Tokens::new(); +- let case = syn::Delimited { +- delim: syn::DelimToken::Brace, +- tts: case.0 +- }; +- case.to_tokens(&mut case_tokens); +- write!(&mut expr, "Case::Case{} => {},\n", i + 1, case_tokens.as_str()).unwrap(); ++ syn::fold::fold_stmt(self, stmt) + } +- expr.push_str("}\n"); // match + +- expr.push_str("}\n"); // top ++ fn fold_expr(&mut self, expr: syn::Expr) -> syn::Expr { ++ match expr { ++ syn::Expr::Macro(syn::ExprMacro{ ref mac, .. }) => { ++ if mac.path == parse_quote!(match_byte) { ++ return syn::fold::fold_expr(self, expand_match_byte(&mac.tts)) ++ } ++ }, ++ _ => {} ++ } + +- expr ++ syn::fold::fold_expr(self, expr) ++ } + } +-- +2.16.2 + diff --git a/cssparser-0.23.2-fix-metadata.diff b/cssparser-0.23.2-fix-metadata.diff index 0a53833..a83fd03 100644 --- a/cssparser-0.23.2-fix-metadata.diff +++ b/cssparser-0.23.2-fix-metadata.diff @@ -1,5 +1,5 @@ --- cssparser-0.23.2/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ cssparser-0.23.2/Cargo.toml 2018-01-24T16:33:34.633474+01:00 ++++ cssparser-0.23.2/Cargo.toml 2018-03-09T13:36:43.388490+01:00 @@ -51,7 +51,7 @@ [dependencies.smallvec] version = "0.6" @@ -9,3 +9,20 @@
[dev-dependencies.encoding_rs] version = "0.7" +@@ -59,10 +59,14 @@ + [dev-dependencies.rustc-serialize] + version = "0.3" + [build-dependencies.quote] +-version = "0.3" ++version = "0.4.1" ++ ++[build-dependencies.proc-macro2] ++version = "0.2" + + [build-dependencies.syn] +-version = "0.11" ++version = "0.12" ++features = ["extra-traits", "fold"] + + [features] + bench = [] diff --git a/rust-cssparser.spec b/rust-cssparser.spec index afaae54..45def58 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.23.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Rust implementation of CSS Syntax Level 3
License: MPLv2.0 @@ -14,7 +14,9 @@ URL: https://crates.io/crates/cssparser Source0: https://crates.io/api/v1/crates/%%7Bcrate%7D/%%7Bversion%7D/download#/%%7Bcr... # Initial patched metadata # * Bump difference to 2.0, https://github.com/servo/rust-cssparser/pull/212 +# * Bump syn to 0.12, quote to 0.4, https://github.com/servo/rust-cssparser/commit/a244c3c36194a90e8081a1a89bf42... Patch0: cssparser-0.23.2-fix-metadata.diff +Patch1: 0001-Update-syn-to-0.12-and-quote-to-0.4.patch
ExclusiveArch: %{rust_arches}
@@ -30,8 +32,9 @@ BuildRequires: (crate(procedural-masquerade) >= 0.1.0 with crate(procedural-mas BuildRequires: (crate(serde) >= 1.0.0 with crate(serde) < 2.0.0) BuildRequires: (crate(smallvec) >= 0.6.0 with crate(smallvec) < 0.7.0) # [build-dependencies] -BuildRequires: (crate(quote) >= 0.3.0 with crate(quote) < 0.4.0) -BuildRequires: (crate(syn) >= 0.11.0 with crate(syn) < 0.12.0) +BuildRequires: (crate(proc-macro2) >= 0.2.0 with crate(proc-macro2) < 0.3.0) +BuildRequires: (crate(quote) >= 0.4.1 with crate(quote) < 0.5.0) +BuildRequires: ((crate(syn) >= 0.12.0 with crate(syn) < 0.13.0) with crate(syn/extra-traits) with crate(syn/fold)) %if %{with check} # [dev-dependencies] BuildRequires: (crate(difference) >= 2.0.0 with crate(difference) < 3.0.0) @@ -72,6 +75,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/
%changelog +* Fri Mar 09 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.2-3 +- Bump syn to 0.12, quote to 0.4 + * Fri Feb 09 2018 Fedora Release Engineering releng@fedoraproject.org - 0.23.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 5998dcb334f67e3e0910865316d4f156818ca916 Author: Fedora Release Engineering releng@fedoraproject.org Date: Fri Feb 9 15:18:14 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/rust-cssparser.spec b/rust-cssparser.spec index f51ebf3..afaae54 100644 --- a/rust-cssparser.spec +++ b/rust-cssparser.spec @@ -6,7 +6,7 @@
Name: rust-%{crate} Version: 0.23.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Rust implementation of CSS Syntax Level 3
License: MPLv2.0 @@ -72,5 +72,8 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/
%changelog +* Fri Feb 09 2018 Fedora Release Engineering releng@fedoraproject.org - 0.23.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.2-1 - Initial package
commit ac8888c2c88b6f8b592dae8f2918391369b2d842 Author: Igor Gnatenko ignatenkobrain@fedoraproject.org Date: Sat Jan 27 07:13:41 2018 +0100
initial import
Signed-off-by: Igor Gnatenko ignatenkobrain@fedoraproject.org
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..87aec8b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/cssparser-0.23.2.crate diff --git a/cssparser-0.23.2-fix-metadata.diff b/cssparser-0.23.2-fix-metadata.diff new file mode 100644 index 0000000..0a53833 --- /dev/null +++ b/cssparser-0.23.2-fix-metadata.diff @@ -0,0 +1,11 @@ +--- cssparser-0.23.2/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ cssparser-0.23.2/Cargo.toml 2018-01-24T16:33:34.633474+01:00 +@@ -51,7 +51,7 @@ + [dependencies.smallvec] + version = "0.6" + [dev-dependencies.difference] +-version = "1.0" ++version = "2.0" + + [dev-dependencies.encoding_rs] + version = "0.7" diff --git a/rust-cssparser.spec b/rust-cssparser.spec new file mode 100644 index 0000000..f51ebf3 --- /dev/null +++ b/rust-cssparser.spec @@ -0,0 +1,76 @@ +# Generated by rust2rpm +%bcond_without check +%global debug_package %{nil} + +%global crate cssparser + +Name: rust-%{crate} +Version: 0.23.2 +Release: 1%{?dist} +Summary: Rust implementation of CSS Syntax Level 3 + +License: MPLv2.0 +URL: https://crates.io/crates/cssparser +Source0: https://crates.io/api/v1/crates/%%7Bcrate%7D/%%7Bversion%7D/download#/%%7Bcr... +# Initial patched metadata +# * Bump difference to 2.0, https://github.com/servo/rust-cssparser/pull/212 +Patch0: cssparser-0.23.2-fix-metadata.diff + +ExclusiveArch: %{rust_arches} + +BuildRequires: rust-packaging +# [dependencies] +BuildRequires: (crate(cssparser-macros) >= 0.3.0 with crate(cssparser-macros) < 0.4.0) +BuildRequires: (crate(dtoa-short) >= 0.3.0 with crate(dtoa-short) < 0.4.0) +BuildRequires: (crate(heapsize) >= 0.3.0 with crate(heapsize) < 0.5.0) +BuildRequires: (crate(itoa) >= 0.3.0 with crate(itoa) < 0.4.0) +BuildRequires: (crate(matches) >= 0.1.0 with crate(matches) < 0.2.0) +BuildRequires: (crate(phf) >= 0.7.0 with crate(phf) < 0.8.0) +BuildRequires: (crate(procedural-masquerade) >= 0.1.0 with crate(procedural-masquerade) < 0.2.0) +BuildRequires: (crate(serde) >= 1.0.0 with crate(serde) < 2.0.0) +BuildRequires: (crate(smallvec) >= 0.6.0 with crate(smallvec) < 0.7.0) +# [build-dependencies] +BuildRequires: (crate(quote) >= 0.3.0 with crate(quote) < 0.4.0) +BuildRequires: (crate(syn) >= 0.11.0 with crate(syn) < 0.12.0) +%if %{with check} +# [dev-dependencies] +BuildRequires: (crate(difference) >= 2.0.0 with crate(difference) < 3.0.0) +BuildRequires: (crate(encoding_rs) >= 0.7.0 with crate(encoding_rs) < 0.8.0) +BuildRequires: (crate(rustc-serialize) >= 0.3.0 with crate(rustc-serialize) < 0.4.0) +%endif + +%description +%{summary}. + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel +Rust implementation of CSS Syntax Level 3. + +This package contains library source intended for building other packages +which use %{crate} from crates.io. + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +# https://github.com/servo/rust-cssparser/issues/213 +%cargo_test --doc +%endif + +%files devel +%{cargo_registry}/%{crate}-%{version}/ + +%changelog +* Wed Jan 24 2018 Igor Gnatenko ignatenkobrain@fedoraproject.org - 0.23.2-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..639990d --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (cssparser-0.23.2.crate) = 53d03959883a27143cf1447880ea2f3ed10580091b831e1e3d1c0726a7e4b82494849022dcc25e4c0aa60286dc573daf7c43986e7e0de651e9b98596db5c33c3
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org