Skip to content

Commit

Permalink
Fixing rpmlint errors (#83)
Browse files Browse the repository at this point in the history
* rename spec file
rename collector.spec.in to opentelemetry-collector.spec.in
rename references of spec file in code

* keep line length limit of 80 char
  • Loading branch information
F-X64 authored Jun 4, 2024
1 parent d64f1e9 commit 300e90a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ _build/otelcol
_build/vendor/**
_build/LICENSE
_build/README.md
collector.spec
opentelemetry-collector.spec
bin/**
dist/**
6 changes: 3 additions & 3 deletions .packit.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# See the documentation for more information:
# https://packit.dev/docs/configuration/

specfile_path: collector.spec
specfile_path: opentelemetry-collector.spec

# add or remove files that should be synced
files_to_sync:
- collector.spec.in
- opentelemetry-collector.spec.in
- .packit.yaml
- Makefile
- _build
Expand All @@ -28,7 +28,7 @@ srpm_build_deps:

actions:
post-upstream-clone:
- make collector.spec
- make opentelemetry-collector.spec

create-archive:
- make archive
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ archive: vendor

# Build the collector as RPM.
.PHONY: rpm/source
rpm/source: collector.spec archive
rpm/source: opentelemetry-collector.spec archive
cp *.spec ./dist && cd dist/ && $(RPM_BUILDER) --release "$(RELEASE)" srpm

.PHONY: collector.spec
collector.spec: collector.spec.in
.PHONY: opentelemetry-collector.spec
opentelemetry-collector.spec: opentelemetry-collector.spec.in
sed -e "s/%%PROJECT%%/$(PROJECT)/" -e "s/%%VERSION%%/$(OTELCOL_VERSION)/" < $< > $@

.PHONY: rpm/fedora-testbuild
Expand All @@ -86,5 +86,5 @@ packit/rpm/mock:
.PHONY: clean
clean:
rm -rf ./dist ./_build/vendor ./bin
rm -rf collector.spec
rm -rf opentelemetry-collector.spec
rm -rf *.tar.gz *.rpm
2 changes: 1 addition & 1 deletion collector.spec.in → opentelemetry-collector.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ExcludeArch: %{ix86} s390 ppc ppc64 aarch64
%gometa

%global common_description %{expand:
Collector with the supported components for a Red Hat build of OpenTelemetry product}
Collector with the supported components for a Red Hat build of OpenTelemetry}

%global golicenses LICENSE
%global godocs README.md
Expand Down

0 comments on commit 300e90a

Please sign in to comment.