From 03217f7fe8ff0fc7a9628ae348e7b0cdf334c04a Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Thu, 19 Oct 2017 17:54:12 +0200 Subject: [PATCH] Consistently name everything [cockpit-]starter-kit (#14) --- Makefile | 6 +++--- starter-cockpit.spec => cockpit-starter-kit.spec | 6 +++--- ...info.xml => org.cockpit-project.starter-kit.metainfo.xml | 4 ++-- package.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename starter-cockpit.spec => cockpit-starter-kit.spec (78%) rename org.cockpit-project.starter.metainfo.xml => org.cockpit-project.starter-kit.metainfo.xml (72%) diff --git a/Makefile b/Makefile index a4444ff..a340674 100644 --- a/Makefile +++ b/Makefile @@ -18,13 +18,13 @@ install-only: # when building a distribution tarball, call webpack with a 'production' environment dist-gzip: NODE_ENV=production dist-gzip: clean all - tar czf $(PACKAGE_NAME)-cockpit.tar.gz --transform 's,^,$(PACKAGE_NAME)-cockpit/,' $$(git ls-files) dist/ + tar czf cockpit-$(PACKAGE_NAME).tar.gz --transform 's,^,cockpit-$(PACKAGE_NAME)/,' $$(git ls-files) dist/ srpm: dist-gzip rpmbuild -bs \ --define "_sourcedir `pwd`" \ --define "_srcrpmdir `pwd`" \ - $(PACKAGE_NAME)-cockpit.spec + cockpit-$(PACKAGE_NAME).spec rpm: dist-gzip mkdir -p "`pwd`/output" @@ -36,6 +36,6 @@ rpm: dist-gzip --define "_srcrpmdir `pwd`" \ --define "_rpmdir `pwd`/output" \ --define "_buildrootdir `pwd`/build" \ - $(PACKAGE_NAME)-cockpit.spec + cockpit-$(PACKAGE_NAME).spec find `pwd`/output -name '*.rpm' -printf '%f\n' -exec mv {} . \; rm -r "`pwd`/rpmbuild" diff --git a/starter-cockpit.spec b/cockpit-starter-kit.spec similarity index 78% rename from starter-cockpit.spec rename to cockpit-starter-kit.spec index d3bd4d8..a6200d8 100644 --- a/starter-cockpit.spec +++ b/cockpit-starter-kit.spec @@ -1,10 +1,10 @@ -Name: starter-cockpit +Name: cockpit-starter-kit Version: 1 Release: 0 Summary: Cockpit Starter Kit Example Module License: LGPLv2.1+ -Source: starter-cockpit.tar.gz +Source: cockpit-starter-kit.tar.gz BuildArch: noarch %define debug_package %{nil} @@ -13,7 +13,7 @@ BuildArch: noarch Cockpit Starter Kit Example Module %prep -%setup -n starter-cockpit +%setup -n cockpit-starter-kit %build diff --git a/org.cockpit-project.starter.metainfo.xml b/org.cockpit-project.starter-kit.metainfo.xml similarity index 72% rename from org.cockpit-project.starter.metainfo.xml rename to org.cockpit-project.starter-kit.metainfo.xml index 4c65960..ad720d8 100644 --- a/org.cockpit-project.starter.metainfo.xml +++ b/org.cockpit-project.starter-kit.metainfo.xml @@ -1,5 +1,5 @@ - org.cockpit-project.starter + org.cockpit-project.starter-kit CC0-1.0 Starter Kit @@ -11,5 +11,5 @@

cockpit.desktop - starter-cockpit + cockpit-starter-kit diff --git a/package.json b/package.json index b3d5804..767a499 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "starter", + "name": "starter-kit", "version": "0.1.0", "description": "Scaffolding for a cockpit module", "main": "index.js",