onosek pushed to rpkg (rawhide). "Patch: Fixes import fail with
sources already imported (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-11-29 02:15:07 UTC
From fc0d2a16d7b2e8bf056971c78125a8a720348493 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Nov 29 2021 01:44:55 +0000
Subject: Patch: Fixes import fail with sources already imported
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/0005-Fixes-import-fail-with-sources-already-imported.patch b/0005-Fixes-import-fail-with-sources-already-imported.patch
new file mode 100644
index 0000000..c80ff60
--- /dev/null
+++ b/0005-Fixes-import-fail-with-sources-already-imported.patch
@@ -0,0 +1,50 @@
+From f1f74e256cde220f04c41d6c86460d64cd3026b2 Mon Sep 17 00:00:00 2001
+From: Dominik Rumian <drumian(a)redhat.com>
+Date: Wed, 15 Sep 2021 12:10:03 +0200
+Subject: [PATCH] Fixes import fail with sources already imported
+
+Fixes: #573
+JIRA: RHELCMP-6481
+
+Signed-off-by: Dominik Rumian <drumian(a)redhat.com>
+---
+ pyrpkg/cli.py | 5 ++++-
+ tests/test_cli.py | 6 +-----
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
+index 6aa8f27..fafada6 100644
+--- a/pyrpkg/cli.py
++++ b/pyrpkg/cli.py
+@@ -2144,7 +2144,10 @@ class cliClient(object):
+ def import_srpm(self):
+ uploadfiles = self.cmd.import_srpm(self.args.srpm)
+ if uploadfiles:
+- self.cmd.upload(uploadfiles, replace=True, offline=self.args.offline)
++ try:
++ self.cmd.upload(uploadfiles, replace=True, offline=self.args.offline)
++ except AlreadyUploadedError:
++ self.log.info("All sources were already uploaded.")
+ if not self.args.skip_diffs:
+ self.cmd.diff(cached=True)
+ self.log.info('--------------------------------------------')
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index 887917c..90c2067 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -1531,11 +1531,7 @@ class TestImportSrpm(LookasideCacheMock, CliTestCase):
+
+ def test_import(self):
+ self.assert_import_srpm(self.chaos_repo)
+- # Exception is not a functionality issue. There is no problem with
+- # uploading same file twice in a test however, the upload method checks
+- # if file has been already uploaded.
+- six.assertRaisesRegex(self, AlreadyUploadedError, r'File already uploaded',
+- self.assert_import_srpm, self.cloned_repo_path)
++ self.assert_import_srpm(self.cloned_repo_path)
+
+ def test_import_gating_and_rpmlintrc_exception(self):
+ # Add three additional files to the repo. Former gating.yaml and package.rpmlintrc are
+--
+2.31.1
+
diff --git a/rpkg.spec b/rpkg.spec
index f91a0c6..11d1df9 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
Name: rpkg
Version: 1.63
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Python library for interacting with rpm+git
License: GPLv2+ and LGPLv2
@@ -21,6 +21,7 @@ Patch1: 0001-Do-not-use-pytest-related-dependencies-temporarily.patch
Patch2: 0002-Use-six-library-in-tests.patch
Patch3: 0003-Pass-sourcedir-to-rpmspec-when-specfile-is-parsed.patch
Patch4: 0004-Print-SpecFile-parsing-debug-info.patch
+Patch5: 0005-Fixes-import-fail-with-sources-already-imported.patch
# RHEL7 is currently the only release that is built for Python 2.
%if 0%{?fedora} || 0%{?rhel} > 7
@@ -244,6 +245,9 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
%changelog
+* Mon Nov 29 2021 Ondřej Nosek <onosek(a)redhat.com> - 1.63-4
+- Patch: Fixes import fail with sources already imported
+
* Mon Sep 13 2021 Ondřej Nosek <onosek(a)redhat.com> - 1.63-3
- Add python-requests-kerberos as a new dependency for RHEL packages
- Patch: Print SpecFile parsing debug info
https://src.fedoraproject.org/rpms/rpkg/c/fc0d2a16d7b2e8bf056971c78125a8a...
2Â years, 5Â months
onosek pushed to rpkg (epel8-playground). "Patch: Fixes import fail
with sources already imported (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-11-29 02:15:30 UTC
From fc0d2a16d7b2e8bf056971c78125a8a720348493 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Nov 29 2021 01:44:55 +0000
Subject: Patch: Fixes import fail with sources already imported
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/0005-Fixes-import-fail-with-sources-already-imported.patch b/0005-Fixes-import-fail-with-sources-already-imported.patch
new file mode 100644
index 0000000..c80ff60
--- /dev/null
+++ b/0005-Fixes-import-fail-with-sources-already-imported.patch
@@ -0,0 +1,50 @@
+From f1f74e256cde220f04c41d6c86460d64cd3026b2 Mon Sep 17 00:00:00 2001
+From: Dominik Rumian <drumian(a)redhat.com>
+Date: Wed, 15 Sep 2021 12:10:03 +0200
+Subject: [PATCH] Fixes import fail with sources already imported
+
+Fixes: #573
+JIRA: RHELCMP-6481
+
+Signed-off-by: Dominik Rumian <drumian(a)redhat.com>
+---
+ pyrpkg/cli.py | 5 ++++-
+ tests/test_cli.py | 6 +-----
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
+index 6aa8f27..fafada6 100644
+--- a/pyrpkg/cli.py
++++ b/pyrpkg/cli.py
+@@ -2144,7 +2144,10 @@ class cliClient(object):
+ def import_srpm(self):
+ uploadfiles = self.cmd.import_srpm(self.args.srpm)
+ if uploadfiles:
+- self.cmd.upload(uploadfiles, replace=True, offline=self.args.offline)
++ try:
++ self.cmd.upload(uploadfiles, replace=True, offline=self.args.offline)
++ except AlreadyUploadedError:
++ self.log.info("All sources were already uploaded.")
+ if not self.args.skip_diffs:
+ self.cmd.diff(cached=True)
+ self.log.info('--------------------------------------------')
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index 887917c..90c2067 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -1531,11 +1531,7 @@ class TestImportSrpm(LookasideCacheMock, CliTestCase):
+
+ def test_import(self):
+ self.assert_import_srpm(self.chaos_repo)
+- # Exception is not a functionality issue. There is no problem with
+- # uploading same file twice in a test however, the upload method checks
+- # if file has been already uploaded.
+- six.assertRaisesRegex(self, AlreadyUploadedError, r'File already uploaded',
+- self.assert_import_srpm, self.cloned_repo_path)
++ self.assert_import_srpm(self.cloned_repo_path)
+
+ def test_import_gating_and_rpmlintrc_exception(self):
+ # Add three additional files to the repo. Former gating.yaml and package.rpmlintrc are
+--
+2.31.1
+
diff --git a/rpkg.spec b/rpkg.spec
index f91a0c6..11d1df9 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
Name: rpkg
Version: 1.63
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Python library for interacting with rpm+git
License: GPLv2+ and LGPLv2
@@ -21,6 +21,7 @@ Patch1: 0001-Do-not-use-pytest-related-dependencies-temporarily.patch
Patch2: 0002-Use-six-library-in-tests.patch
Patch3: 0003-Pass-sourcedir-to-rpmspec-when-specfile-is-parsed.patch
Patch4: 0004-Print-SpecFile-parsing-debug-info.patch
+Patch5: 0005-Fixes-import-fail-with-sources-already-imported.patch
# RHEL7 is currently the only release that is built for Python 2.
%if 0%{?fedora} || 0%{?rhel} > 7
@@ -244,6 +245,9 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
%changelog
+* Mon Nov 29 2021 Ondřej Nosek <onosek(a)redhat.com> - 1.63-4
+- Patch: Fixes import fail with sources already imported
+
* Mon Sep 13 2021 Ondřej Nosek <onosek(a)redhat.com> - 1.63-3
- Add python-requests-kerberos as a new dependency for RHEL packages
- Patch: Print SpecFile parsing debug info
https://src.fedoraproject.org/rpms/rpkg/c/fc0d2a16d7b2e8bf056971c78125a8a...
2Â years, 5Â months
linkdupont pushed to rust-rust-embed-impl5.9 (rawhide). "no longer
used by upstream"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-11-29 02:10:50 UTC
From a22f97883d23d96e49103ed32fd76973cfa5dc95 Mon Sep 17 00:00:00 2001
From: Link Dupont <link(a)sub-pop.net>
Date: Nov 29 2021 02:10:45 +0000
Subject: no longer used by upstream
---
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 4593288..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/rust-embed-impl-5.9.0.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index d542bba..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-rust-embed-impl5.9
-
-The rust-rust-embed-impl5.9 package
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..9d7e855
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+no longer used by upstream
diff --git a/rust-rust-embed-impl5.9.spec b/rust-rust-embed-impl5.9.spec
deleted file mode 100644
index 698c32f..0000000
--- a/rust-rust-embed-impl5.9.spec
+++ /dev/null
@@ -1,124 +0,0 @@
-# Generated by rust2rpm 16
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate rust-embed-impl
-
-Name: rust-%{crate}5.9
-Version: 5.9.0
-Release: 1%{?dist}
-Summary: Custom Derive Macro which loads files into the rust binary
-
-# Upstream license specification: MIT
-License: MIT
-URL: https://crates.io/crates/rust-embed-impl
-Source: %{crates_source}
-
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
-
-%global _description %{expand:
-Rust Custom Derive Macro which loads files into the rust binary at compile time
-during release and loads the file from the fs during dev.}
-
-%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}+compression-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+compression-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "compression" feature of "%{crate}" crate.
-
-%files -n %{name}+compression-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+debug-embed-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+debug-embed-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "debug-embed" feature of "%{crate}" crate.
-
-%files -n %{name}+debug-embed-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+interpolate-folder-path-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+interpolate-folder-path-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "interpolate-folder-path" feature of "%{crate}" crate.
-
-%files -n %{name}+interpolate-folder-path-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+shellexpand-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+shellexpand-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "shellexpand" feature of "%{crate}" crate.
-
-%files -n %{name}+shellexpand-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
-%cargo_test
-%endif
-
-%changelog
-* Mon Nov 15 2021 Link Dupont <linkdupont(a)fedoraproject.org> - 5.9.0-1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index b068a8a..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (rust-embed-impl-5.9.0.crate) = dfd2c3ec82872c3e48afa3466215cd075cf59beee08c267f5c5f36b87cd14e674616eed0838f40530a257a7961acb999beeeb939f00d39f093b2a3d0ca25ac67
https://src.fedoraproject.org/rpms/rust-rust-embed-impl5.9/c/a22f97883d23...
2Â years, 5Â months
linkdupont pushed to rust-rust-embed5.9 (rawhide). "no longer used by
upstream"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-11-29 02:11:01 UTC
From 1c3f7f28a6879213a9dc0796c2fb1674e6c5c963 Mon Sep 17 00:00:00 2001
From: Link Dupont <link(a)sub-pop.net>
Date: Nov 29 2021 02:10:55 +0000
Subject: no longer used by upstream
---
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7913802..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/rust-embed-5.9.0.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 4a7323b..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-rust-embed5.9
-
-The rust-rust-embed5.9 package
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..9d7e855
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+no longer used by upstream
diff --git a/rust-embed-fix-metadata.diff b/rust-embed-fix-metadata.diff
deleted file mode 100644
index 7003428..0000000
--- a/rust-embed-fix-metadata.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- rust-embed-5.9.0/Cargo.toml 2021-01-18T14:59:27+00:00
-+++ rust-embed-5.9.0/Cargo.toml 2021-03-04T12:17:28.031840+00:00
-@@ -33,11 +33,6 @@
- path = "examples/actix.rs"
- required-features = ["actix"]
-
--[[example]]
--name = "rocket"
--path = "examples/rocket.rs"
--required-features = ["rocket"]
--
- [[test]]
- name = "interpolated_path"
- path = "tests/interpolated_path.rs"
-@@ -47,19 +42,9 @@
- optional = true
- default-features = false
-
--[dependencies.include-flate]
--version = "0.1"
--features = ["stable"]
--optional = true
--
- [dependencies.mime_guess]
- version = "2"
- optional = true
--
--[dependencies.rocket]
--version = "0.4.5"
--optional = true
--default-features = false
-
- [dependencies.rust-embed-impl]
- version = "5.9.0"
-@@ -82,10 +67,8 @@
-
- [features]
- actix = ["actix-web", "mime_guess"]
--compression = ["rust-embed-impl/compression", "include-flate"]
- debug-embed = ["rust-embed-impl/debug-embed", "rust-embed-utils/debug-embed"]
- interpolate-folder-path = ["rust-embed-impl/interpolate-folder-path"]
--nightly = ["rocket"]
- warp-ex = ["warp", "tokio", "mime_guess"]
- [badges.appveyor]
- repository = "pyros2097/rust-embed"
diff --git a/rust-rust-embed5.9.spec b/rust-rust-embed5.9.spec
deleted file mode 100644
index 14e8163..0000000
--- a/rust-rust-embed5.9.spec
+++ /dev/null
@@ -1,180 +0,0 @@
-# Generated by rust2rpm 16
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate rust-embed
-
-Name: rust-%{crate}5.9
-Version: 5.9.0
-Release: 1%{?dist}
-Summary: Custom Derive Macro which loads files into the rust binary
-
-# Upstream license specification: MIT
-License: MIT
-URL: https://crates.io/crates/rust-embed
-Source: %{crates_source}
-# Initial patched metadata
-# * Remove optional features with missing dependencies:
-# - optional compression support: include-flate not packaged
-# - optional rocket support: nightly-only
-Patch0: rust-embed-fix-metadata.diff
-
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
-
-%global _description %{expand:
-Rust Custom Derive Macro which loads files into the rust binary at compile time
-during release and loads the file from the fs during dev.}
-
-%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 changelog.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}+actix-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+actix-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "actix" feature of "%{crate}" crate.
-
-%files -n %{name}+actix-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+actix-web-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+actix-web-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "actix-web" feature of "%{crate}" crate.
-
-%files -n %{name}+actix-web-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+debug-embed-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+debug-embed-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "debug-embed" feature of "%{crate}" crate.
-
-%files -n %{name}+debug-embed-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+interpolate-folder-path-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+interpolate-folder-path-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "interpolate-folder-path" feature of "%{crate}" crate.
-
-%files -n %{name}+interpolate-folder-path-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+mime_guess-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+mime_guess-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "mime_guess" feature of "%{crate}" crate.
-
-%files -n %{name}+mime_guess-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+tokio-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+tokio-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "tokio" feature of "%{crate}" crate.
-
-%files -n %{name}+tokio-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+warp-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+warp-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "warp" feature of "%{crate}" crate.
-
-%files -n %{name}+warp-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+warp-ex-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+warp-ex-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "warp-ex" feature of "%{crate}" crate.
-
-%files -n %{name}+warp-ex-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-# remove nightly-only rocket example
-rm examples/rocket.rs
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-# doctests are broken
-%cargo_test -- --lib
-%endif
-
-%changelog
-* Mon Nov 15 2021 Link Dupont <linkdupont(a)fedoraproject.org> - 5.9.0-1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index 8140031..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (rust-embed-5.9.0.crate) = 2cdaf6b622f81e4e1126fe7809a8dc97bf6936b179aff38419ce24171be92eb7f703b04ecd3ed35a93a2af89a06dd2fbe42a80591fc51e699dcbd753f076a6bd
https://src.fedoraproject.org/rpms/rust-rust-embed5.9/c/1c3f7f28a6879213a...
2Â years, 5Â months
linkdupont pushed to rust-rust-embed-utils5.1 (rawhide). "no longer
used by upstream"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-11-29 02:10:33 UTC
From 45193e152c1c839316440e89fd28f55d5335c1ae Mon Sep 17 00:00:00 2001
From: Link Dupont <link(a)sub-pop.net>
Date: Nov 29 2021 02:10:27 +0000
Subject: no longer used by upstream
---
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ff57606..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/rust-embed-utils-5.1.0.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 81f46a5..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-rust-embed-utils5.1
-
-The rust-rust-embed-utils5.1 package
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..9d7e855
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+no longer used by upstream
diff --git a/rust-rust-embed-utils5.1.spec b/rust-rust-embed-utils5.1.spec
deleted file mode 100644
index 1439b5c..0000000
--- a/rust-rust-embed-utils5.1.spec
+++ /dev/null
@@ -1,86 +0,0 @@
-# Generated by rust2rpm 16
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate rust-embed-utils
-
-Name: rust-%{crate}5.1
-Version: 5.1.0
-Release: 1%{?dist}
-Summary: Utilities for rust-embed
-
-# Upstream license specification: MIT
-License: MIT
-URL: https://crates.io/crates/rust-embed-utils
-Source: %{crates_source}
-
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
-
-%global _description %{expand:
-Utilities for rust-embed.}
-
-%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
-%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}+debug-embed-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+debug-embed-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "debug-embed" feature of "%{crate}" crate.
-
-%files -n %{name}+debug-embed-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
-%cargo_test
-%endif
-
-%changelog
-* Mon Nov 15 2021 - Link Dupont <linkdupont(a)fedoraproject.org> - 5.1.0-1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index 1a432c0..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (rust-embed-utils-5.1.0.crate) = 8859374e21480133564a98d8dbdf43f5c04f0af205c4568e200eb1c87d437df4c5d73d65b82b5e0af65f02016f82db403140105346f597b3c0b48aae7b34dab3
https://src.fedoraproject.org/rpms/rust-rust-embed-utils5.1/c/45193e152c1...
2Â years, 5Â months
alebastr pushed to sway-systemd (f34). "Update to 0.2.1"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-11-29 02:09:16 UTC
From a5db2ca5860314991ba18ce35cfa8eb05133bac7 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr(a)fedoraproject.org>
Date: Nov 29 2021 01:55:33 +0000
Subject: Update to 0.2.1
---
diff --git a/.gitignore b/.gitignore
index 07f52cd..51cca89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
*.src.rpm
results_*/
-/sway-systemd-0.2.0.tar.gz
+/sway-systemd-0.2.1.tar.gz
diff --git a/sources b/sources
index 4d5ab0d..c8fe3c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sway-systemd-0.2.0.tar.gz) = ddf8550db80850f52eaf6d9416a75459a76dcc421af0eca6645f4277529fcb9b70e710f52e42e2021978da72fa89840923b9c009837dd331f4bcfaa0cbf14f87
+SHA512 (sway-systemd-0.2.1.tar.gz) = a852d20608dc9f3e63d154a024761825341667feaee2ea063108379150ebdd010675e505d3e835d361ed036b81f9e6e59df2d3f6c3b8e45a8b190481ea2a8b68
diff --git a/sway-systemd.spec b/sway-systemd.spec
index c47c677..7373efb 100644
--- a/sway-systemd.spec
+++ b/sway-systemd.spec
@@ -5,7 +5,7 @@
%endif
Name: sway-systemd
-Version: 0.2.0
+Version: 0.2.1
Release: 1%{?dist}
Summary: Systemd integration for Sway session
@@ -69,6 +69,9 @@ This includes several areas of integration:
%endif
%changelog
+* Sun Nov 28 2021 Aleksei Bavshin <alebastr(a)fedoraproject.org> - 0.2.1-1
+- Update to 0.2.1
+
* Mon Aug 09 2021 Aleksei Bavshin <alebastr(a)fedoraproject.org> - 0.2.0-1
- Update to 0.2.0
https://src.fedoraproject.org/rpms/sway-systemd/c/a5db2ca5860314991ba18ce...
2Â years, 5Â months
linkdupont pushed to rust-ouroboros0.9 (rawhide). "no longer used by
upstream project"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-11-29 02:08:46 UTC
From 36aba2451c5262a26739a4d3f153e8aa6e28ba5b Mon Sep 17 00:00:00 2001
From: Link Dupont <link(a)sub-pop.net>
Date: Nov 29 2021 02:08:40 +0000
Subject: no longer used by upstream project
---
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index acf71bc..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/ouroboros-0.9.3.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 793bb1c..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-ouroboros0.9
-
-The rust-ouroboros0.9 package
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..c8e3ee3
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+no longer used by upstream project
diff --git a/rust-ouroboros0.9.spec b/rust-ouroboros0.9.spec
deleted file mode 100644
index 9c80bcd..0000000
--- a/rust-ouroboros0.9.spec
+++ /dev/null
@@ -1,75 +0,0 @@
-# Generated by rust2rpm 17
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate ouroboros
-
-Name: rust-%{crate}0.9
-Version: 0.9.3
-Release: 1%{?dist}
-Summary: Easy, safe self-referential struct generation
-
-# Upstream license specification: MIT OR Apache-2.0
-License: MIT or ASL 2.0
-URL: https://crates.io/crates/ouroboros
-Source: %{crates_source}
-
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
-
-%global _description %{expand:
-Easy, safe self-referential struct generation.}
-
-%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
-# crate does neither include README nor LICENSE file
-# %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
-
-%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
-%cargo_test
-%endif
-
-%changelog
-* Tue Nov 15 2021 - Link Dupont <linkdupont(a)fedoraproject.org> - 0.9.3-1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index b08c58f..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (ouroboros-0.9.3.crate) = 82a39c81c043bbfcc5ef8d72ed33ebf2dbc40847e143e06d09781d522e1810580bd6771387adcbc18269b632bc956583850e28a2298532aec5ea66ab6a5d977a
https://src.fedoraproject.org/rpms/rust-ouroboros0.9/c/36aba2451c5262a267...
2Â years, 5Â months
linkdupont pushed to rust-ouroboros_macro0.9 (rawhide). "no longer
used by upstream project"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-11-29 02:08:23 UTC
From b637c8a92df5be855323dda4215842829a15ef6d Mon Sep 17 00:00:00 2001
From: Link Dupont <link(a)sub-pop.net>
Date: Nov 29 2021 02:08:17 +0000
Subject: no longer used by upstream project
---
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c904658..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/ouroboros_macro-0.9.3.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index ab1c955..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-ouroboros_macro0.9
-
-The rust-ouroboros_macro0.9 package
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..c8e3ee3
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+no longer used by upstream project
diff --git a/rust-ouroboros_macro0.9.spec b/rust-ouroboros_macro0.9.spec
deleted file mode 100644
index 92c9fbb..0000000
--- a/rust-ouroboros_macro0.9.spec
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by rust2rpm 17
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate ouroboros_macro
-
-Name: rust-%{crate}0.9
-Version: 0.9.3
-Release: 1%{?dist}
-Summary: Proc macro for ouroboros crate
-
-# Upstream license specification: MIT OR Apache-2.0
-License: MIT or ASL 2.0
-URL: https://crates.io/crates/ouroboros_macro
-Source: %{crates_source}
-
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
-
-%global _description %{expand:
-Proc macro for ouroboros crate.}
-
-%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
-%{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
-
-%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
-%cargo_test
-%endif
-
-%changelog
-* Mon Nov 15 2021 Link Dupont <linkdupont(a)fedoraproject.org> - 0.9.3-1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index 5d9846e..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (ouroboros_macro-0.9.3.crate) = 8ac05813313ca765560d584dc1fbc741f16389c7cc9731bc5d3f6e9d799c58283960e696ae026fb57df778853ddc3b6318bfc6f9ddfb39dbc6c1b13fca0dd075
https://src.fedoraproject.org/rpms/rust-ouroboros_macro0.9/c/b637c8a92df5...
2Â years, 5Â months
linkdupont pushed to rust-i18n-embed-fl (f35). "new upstream version"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-11-29 02:06:22 UTC
From 9d54e113f96bf9705f2aea8d5eb8ba2c030dad8b Mon Sep 17 00:00:00 2001
From: Link Dupont <link(a)sub-pop.net>
Date: Nov 23 2021 04:33:16 +0000
Subject: new upstream version
---
diff --git a/.gitignore b/.gitignore
index 5b24da6..b938689 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/i18n-embed-fl-0.5.0.crate
+/i18n-embed-fl-0.6.0.crate
diff --git a/rust-i18n-embed-fl.spec b/rust-i18n-embed-fl.spec
index 11464f6..0317655 100644
--- a/rust-i18n-embed-fl.spec
+++ b/rust-i18n-embed-fl.spec
@@ -5,7 +5,7 @@
%global crate i18n-embed-fl
Name: rust-%{crate}
-Version: 0.5.0
+Version: 0.6.0
Release: 1%{?dist}
Summary: Macro to perform compile time checks when using the i18n-embed crate and the fluent localization system
@@ -74,5 +74,8 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Mon Nov 22 2021 Link Dupont <linkdupont(a)fedoraproject.org> - 0.6.0-1
+- New upstream version
+
* Mon Oct 04 2021 Link Dupont <linkdupont(a)fedoraproject.org> - 0.5.0-1
- Initial package
diff --git a/sources b/sources
index 4549392..51c0aa2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (i18n-embed-fl-0.5.0.crate) = cc472cd0331e95daf591ea46e8cd28b2d7e6ab40a789115bf20f1cd03fee703b8cd0c3070d117d3153d77e4d9dcc449d82f2a1b7fbbaeb19bc98a5f7addbc6a9
+SHA512 (i18n-embed-fl-0.6.0.crate) = ebc9a99640cfea42c6a3ae63c7bfc9b91d9ac3a1937d8770fa995d435b470b8a3401fa9c6d88f133d1b28a31dfa9cc363ddb54919151a30fc13b2bfe8115e04b
https://src.fedoraproject.org/rpms/rust-i18n-embed-fl/c/9d54e113f96bf9705...
2Â years, 5Â months
linkdupont pushed to rust-i18n-embed-fl (f35). "initial package
(..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-11-29 02:06:22 UTC
From 051961013fd934931e3b5fee46612d1ae342affb Mon Sep 17 00:00:00 2001
From: Link Dupont <link(a)sub-pop.net>
Date: Nov 15 2021 19:41:44 +0000
Subject: initial package
Relates: RHBZ#2022198
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5b24da6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/i18n-embed-fl-0.5.0.crate
diff --git a/add-missing-test-files.patch b/add-missing-test-files.patch
new file mode 100644
index 0000000..c8302b7
--- /dev/null
+++ b/add-missing-test-files.patch
@@ -0,0 +1,25 @@
+diff -urN i18n-embed-fl-0.5.0.orig/i18n/en-US/i18n_embed_fl.ftl i18n-embed-fl-0.5.0/i18n/en-US/i18n_embed_fl.ftl
+--- i18n-embed-fl-0.5.0.orig/i18n/en-US/i18n_embed_fl.ftl 1969-12-31 19:00:00.000000000 -0500
++++ i18n-embed-fl-0.5.0/i18n/en-US/i18n_embed_fl.ftl 2021-10-04 20:52:55.295942278 -0400
+@@ -0,0 +1,3 @@
++hello-world = Hello World!
++hello-arg = Hello {$name}!
++hello-arg-2 = Hello {$name1} and {$name2}!
+\ No newline at end of file
+diff -urN i18n-embed-fl-0.5.0.orig/i18n.toml i18n-embed-fl-0.5.0/i18n.toml
+--- i18n-embed-fl-0.5.0.orig/i18n.toml 1969-12-31 19:00:00.000000000 -0500
++++ i18n-embed-fl-0.5.0/i18n.toml 2021-10-04 20:52:19.049735485 -0400
+@@ -0,0 +1,12 @@
++# (Required) The language identifier of the language used in the
++# source code for gettext system, and the primary fallback language
++# (for which all strings must be present) when using the fluent
++# system.
++fallback_language = "en-US"
++
++# Use the fluent localization system.
++[fluent]
++# (Required) The path to the assets directory.
++# The paths inside the assets directory should be structured like so:
++# `assets_dir/{language}/{domain}.ftl`
++assets_dir = "i18n"
+\ No newline at end of file
diff --git a/disable-doctests.patch b/disable-doctests.patch
new file mode 100644
index 0000000..d0845b1
--- /dev/null
+++ b/disable-doctests.patch
@@ -0,0 +1,22 @@
+diff -urN i18n-embed-fl-0.5.0.orig/Cargo.toml i18n-embed-fl-0.5.0/Cargo.toml
+--- i18n-embed-fl-0.5.0.orig/Cargo.toml 1969-12-31 19:00:00.000000000 -0500
++++ i18n-embed-fl-0.5.0/Cargo.toml 2021-10-04 20:50:28.694723432 -0400
+@@ -22,6 +22,7 @@
+
+ [lib]
+ proc-macro = true
++doctest = false
+ [dependencies.dashmap]
+ version = "4.0"
+
+diff -urN i18n-embed-fl-0.5.0.orig/Cargo.toml.orig i18n-embed-fl-0.5.0/Cargo.toml.orig
+--- i18n-embed-fl-0.5.0.orig/Cargo.toml.orig 1969-12-31 19:00:00.000000000 -0500
++++ i18n-embed-fl-0.5.0/Cargo.toml.orig 2021-10-04 20:50:34.888055687 -0400
+@@ -10,6 +10,7 @@
+
+ [lib]
+ proc-macro = true
++doctest = false
+
+ [dependencies]
+ dashmap = "4.0"
diff --git a/rust-i18n-embed-fl.spec b/rust-i18n-embed-fl.spec
new file mode 100644
index 0000000..11464f6
--- /dev/null
+++ b/rust-i18n-embed-fl.spec
@@ -0,0 +1,78 @@
+# Generated by rust2rpm 18
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate i18n-embed-fl
+
+Name: rust-%{crate}
+Version: 0.5.0
+Release: 1%{?dist}
+Summary: Macro to perform compile time checks when using the i18n-embed crate and the fluent localization system
+
+# Upstream license specification: MIT
+License: MIT
+URL: https://crates.io/crates/i18n-embed-fl
+Source: %{crates_source}
+Patch0: disable-doctests.patch
+Patch1: add-missing-test-files.patch
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Macro to perform compile time checks when using the i18n-embed crate and the
+fluent localization system.}
+
+%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.txt
+%doc README.md CHANGELOG.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
+
+%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
+%cargo_test
+%endif
+
+%changelog
+* Mon Oct 04 2021 Link Dupont <linkdupont(a)fedoraproject.org> - 0.5.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..4549392
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (i18n-embed-fl-0.5.0.crate) = cc472cd0331e95daf591ea46e8cd28b2d7e6ab40a789115bf20f1cd03fee703b8cd0c3070d117d3153d77e4d9dcc449d82f2a1b7fbbaeb19bc98a5f7addbc6a9
https://src.fedoraproject.org/rpms/rust-i18n-embed-fl/c/051961013fd934931...
2Â years, 5Â months