Remove all remaining mentions of "subscriptions"

This commit is contained in:
Lars Karlitski 2017-10-17 17:00:26 +02:00
parent 4aa750a0fe
commit fff21fdff6
15 changed files with 45 additions and 71 deletions

2
.gitignore vendored
View file

@ -4,5 +4,3 @@ node_modules/
dist/ dist/
/.vagrant /.vagrant
/webpack.inputs /webpack.inputs
/subscription-manager-cockpit.tar.gz
/subscription-manager-cockpit-*.*.rpm

View file

@ -1,3 +1,5 @@
PACKAGE_NAME := $(shell python3 -c "import json; print(json.load(open('package.json'))['name'])")
all: all:
NODE_ENV=$(NODE_ENV) npm run build NODE_ENV=$(NODE_ENV) npm run build
@ -8,14 +10,14 @@ clean:
install: all install-only install: all install-only
install-only: install-only:
mkdir -p $(DESTDIR)/usr/share/cockpit/subscription-manager mkdir -p $(DESTDIR)/usr/share/cockpit/$(PACKAGE_NAME)
cp -r dist/* $(DESTDIR)/usr/share/cockpit/subscription-manager cp -r dist/* $(DESTDIR)/usr/share/cockpit/$(PACKAGE_NAME)
mkdir -p $(DESTDIR)/usr/share/metainfo/ mkdir -p $(DESTDIR)/usr/share/metainfo/
cp org.cockpit-project.subscription-manager.metainfo.xml $(DESTDIR)/usr/share/metainfo/ cp org.cockpit-project.$(PACKAGE_NAME).metainfo.xml $(DESTDIR)/usr/share/metainfo/
EXTRA_DIST = \ EXTRA_DIST = \
README.md \ README.md \
org.cockpit-project.subscription-manager.metainfo.xml \ org.cockpit-project.$(PACKAGE_NAME).metainfo.xml \
package.json \ package.json \
.eslintrc.json \ .eslintrc.json \
webpack.config.js \ webpack.config.js \
@ -25,13 +27,13 @@ EXTRA_DIST = \
# when building a distribution tarball, call webpack with a 'production' environment # when building a distribution tarball, call webpack with a 'production' environment
dist-gzip: NODE_ENV=production dist-gzip: NODE_ENV=production
dist-gzip: clean all dist-gzip: clean all
tar czf subscription-manager-cockpit.tar.gz --transform 's,^,subscription-manager-cockpit/,' $$(cat webpack.inputs) $(EXTRA_DIST) dist/ tar czf $(PACKAGE_NAME)-cockpit.tar.gz --transform 's,^,$(PACKAGE_NAME)-cockpit/,' $$(cat webpack.inputs) $(EXTRA_DIST) dist/
srpm: dist-gzip srpm: dist-gzip
rpmbuild -bs \ rpmbuild -bs \
--define "_sourcedir `pwd`" \ --define "_sourcedir `pwd`" \
--define "_srcrpmdir `pwd`" \ --define "_srcrpmdir `pwd`" \
subscription-manager-cockpit.spec $(PACKAGE_NAME)-cockpit.spec
rpm: dist-gzip rpm: dist-gzip
mkdir -p "`pwd`/output" mkdir -p "`pwd`/output"
@ -43,6 +45,6 @@ rpm: dist-gzip
--define "_srcrpmdir `pwd`" \ --define "_srcrpmdir `pwd`" \
--define "_rpmdir `pwd`/output" \ --define "_rpmdir `pwd`/output" \
--define "_buildrootdir `pwd`/build" \ --define "_buildrootdir `pwd`/build" \
subscription-manager-cockpit.spec $(PACKAGE_NAME)-cockpit.spec
find `pwd`/output -name '*.rpm' -printf '%f\n' -exec mv {} . \; find `pwd`/output -name '*.rpm' -printf '%f\n' -exec mv {} . \;
rm -r "`pwd`/rpmbuild" rm -r "`pwd`/rpmbuild"

View file

@ -1,4 +1,5 @@
# Subscription-manager # Cockpit Starter Kit
**A Cockpit plugin to administer candlepin subscriptions**
Scaffolding for a [Cockpit](http://www.cockpit-project.org) module.
See [docs/build-notes.md](docs/build-notes.md) for more information on how to build and install this package. See [docs/build-notes.md](docs/build-notes.md) for more information on how to build and install this package.

View file

@ -4,7 +4,7 @@ These are some basic notes on building the plugin
## yarn ## yarn
The subscription-manager plugin for cockpit is built using webpack 2.x. Although npm can be used to install the various The starter kit plugin for cockpit is built using webpack 2.x. Although npm can be used to install the various
dependencies, it is recommended to install [yarn][-yarnpkg] and use it instead: dependencies, it is recommended to install [yarn][-yarnpkg] and use it instead:
``` ```
@ -72,7 +72,7 @@ make
Then, link the `dist` directory in a place where cockpit can find it, without installing to the system directory. Then, link the `dist` directory in a place where cockpit can find it, without installing to the system directory.
Call the following script from the git checkout: Call the following script from the git checkout:
``` ```
ln -s ./dist subscription-manager ln -s ./dist starter
``` ```
Then use webpack to monitor the filesystem for changes, also from the git checkout: Then use webpack to monitor the filesystem for changes, also from the git checkout:

View file

@ -0,0 +1,15 @@
<component type="addon">
<id>org.cockpit-project.starter</id>
<metadata_license>CC0-1.0</metadata_license>
<name>Starter Kit</name>
<summary>
Scaffolding for a cockpit module.
</summary>
<description>
<p>
Scaffolding for a cockpit module.
</p>
</description>
<extends>cockpit.desktop</extends>
<launchable type="cockpit-package">starter-cockpit</launchable>
</component>

View file

@ -1,15 +0,0 @@
<component type="addon">
<id>org.cockpit-project.subscription-manager</id>
<metadata_license>CC0-1.0</metadata_license>
<name>Subscription Manager</name>
<summary>
Subscription Manager in Cockpit
</summary>
<description>
<p>
Manage subscriptions to a Candlepin backend, such as for Red Hat products.
</p>
</description>
<extends>cockpit.desktop</extends>
<launchable type="cockpit-package">subscription-manager-cockpit</launchable>
</component>

View file

@ -1,9 +1,9 @@
{ {
"name": "subscription-manager", "name": "starter",
"version": "0.1.0", "version": "0.1.0",
"description": "a plugin for cockpit to manage subscriptions", "description": "Scaffolding for a cockpit module",
"main": "index.js", "main": "index.js",
"repository": "git@github.com:rarebreed/subscription-manager.git", "repository": "git@github.com:cockpit/starter-kit.git",
"author": "", "author": "",
"license": "LGPL-2.1", "license": "LGPL-2.1",
"scripts": { "scripts": {

View file

@ -18,12 +18,12 @@
* along with Cockpit; If not, see <http://www.gnu.org/licenses/>. * along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
*/ */
import React from 'react'; import React from 'react';
import { Subscriptions } from './subscriptions-view.jsx'; import { StarterKit } from './starter-kit-view.jsx';
function render() { function render() {
React.render( React.render(
React.createElement( React.createElement(
Subscriptions, StarterKit,
{title: "Sample Page"} {title: "Sample Page"}
), ),
document.getElementById('app') document.getElementById('app')

View file

@ -1,7 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<!-- <!--
This file is part of subscription-manager.
Copyright (C) 2017 Red Hat, Inc. Copyright (C) 2017 Red Hat, Inc.
Cockpit is free software; you can redistribute it and/or modify it Cockpit is free software; you can redistribute it and/or modify it
@ -15,17 +13,16 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with subscription-manager; If not, see <http://www.gnu.org/licenses/>. along with this package; If not, see <http://www.gnu.org/licenses/>.
--> -->
<html lang="en"> <html lang="en">
<head> <head>
<title translatable="yes">Subscriptions</title> <title translatable="yes">Cockpit Starter Kit</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="../base1/patternfly.css"> <link rel="stylesheet" href="../base1/patternfly.css">
<link href="subscriptions.css" rel="stylesheet">
<script type="text/javascript" src="../base1/cockpit.js"></script> <script type="text/javascript" src="../base1/cockpit.js"></script>
<script type="text/javascript" src="../*/po.js"></script> <script type="text/javascript" src="../*/po.js"></script>

View file

@ -1,6 +1,4 @@
/* /*
* This file is part of Cockpit.
*
* Copyright (C) 2017 Red Hat, Inc. * Copyright (C) 2017 Red Hat, Inc.
* *
* Cockpit is free software; you can redistribute it and/or modify it * Cockpit is free software; you can redistribute it and/or modify it
@ -14,7 +12,7 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with subscription-manager; If not, see <http://www.gnu.org/licenses/>. * along with this package; If not, see <http://www.gnu.org/licenses/>.
*/ */
var cockpit = require("cockpit"); var cockpit = require("cockpit");

View file

@ -6,7 +6,7 @@
"tools": { "tools": {
"index": { "index": {
"label": "subscription-manager" "label": "Starter Kit"
} }
} }
} }

View file

@ -19,7 +19,7 @@
*/ */
import React from 'react'; import React from 'react';
export class Subscriptions extends React.Component { export class StarterKit extends React.Component {
constructor() { constructor() {
super(); super();
// a good place to initialize this.state // a good place to initialize this.state

View file

@ -1,19 +0,0 @@
/*
* This file is part of Cockpit.
*
* Copyright (C) 2017 Red Hat, Inc.
*
* Cockpit is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* Cockpit is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
*/

View file

@ -1,21 +1,19 @@
Name: subscription-manager-cockpit Name: starter-cockpit
Version: 1 Version: 1
Release: 0 Release: 0
Summary: Subscription Manager Cockpit UI Summary: Cockpit Starter Kit Example Module
License: LGPLv2.1+ License: LGPLv2.1+
Source: subscription-manager-cockpit.tar.gz Source: starter-cockpit.tar.gz
BuildArch: noarch BuildArch: noarch
Requires: subscription-manager
%define debug_package %{nil} %define debug_package %{nil}
%description %description
Subscription Manager Cockpit UI Cockpit Starter Kit Example Module
%prep %prep
%setup -n subscription-manager-cockpit %setup -n starter-cockpit
%build %build

View file

@ -21,8 +21,7 @@ var production = process.env.NODE_ENV === 'production';
var info = { var info = {
entries: { entries: {
"index": [ "index": [
"./index.js", "./index.js"
"./subscriptions.css",
] ]
}, },
files: [ files: [