From 15e08d632fb305476914041d28395fc16e79efa1 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sat, 4 Apr 2020 23:11:22 +0200 Subject: Heavy renaming and 0-check fix --- rpm/BinaryFun.changes.in | 17 ----------- rpm/BinaryFun.changes.run.in | 25 ---------------- rpm/BinaryFun.spec | 71 -------------------------------------------- rpm/BinaryFun.yaml | 45 ---------------------------- rpm/harbour-binaryfun.spec | 71 ++++++++++++++++++++++++++++++++++++++++++++ rpm/harbour-binaryfun.yaml | 45 ++++++++++++++++++++++++++++ 6 files changed, 116 insertions(+), 158 deletions(-) delete mode 100644 rpm/BinaryFun.changes.in delete mode 100644 rpm/BinaryFun.changes.run.in delete mode 100644 rpm/BinaryFun.spec delete mode 100644 rpm/BinaryFun.yaml create mode 100644 rpm/harbour-binaryfun.spec create mode 100644 rpm/harbour-binaryfun.yaml (limited to 'rpm') diff --git a/rpm/BinaryFun.changes.in b/rpm/BinaryFun.changes.in deleted file mode 100644 index cc8397e..0000000 --- a/rpm/BinaryFun.changes.in +++ /dev/null @@ -1,17 +0,0 @@ -# Rename this file as BinaryFun.changes to include changelog -# entries in your RPM file. -# -# Add new changelog entries following the format below. -# Add newest entries to the top of the list. -# Separate entries from eachother with a blank line. -# -# Alternatively, if your changelog is automatically generated (e.g. with -# the git-change-log command provided with Sailfish OS SDK), create a -# BinaryFun.changes.run script to let mb2 run the required commands for you. - -# * date Author's Name version-release -# - Summary of changes - -* Mon Jan 7 2019 Marvin Borner 0.1.1 -- Fixed bug with decimal zero - diff --git a/rpm/BinaryFun.changes.run.in b/rpm/BinaryFun.changes.run.in deleted file mode 100644 index c7f6475..0000000 --- a/rpm/BinaryFun.changes.run.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# Rename this file as BinaryFun.changes.run to let mb2 automatically -# generate changelog from well formatted Git commit messages and tag -# annotations. - -git-change-log - -# Here are some basic examples how to change from the default behavior. Run -# git-change-log --help inside the Sailfish OS SDK chroot or build engine to -# learn all the options git-change-log accepts. - -# Use a subset of tags -#git-change-log --tags refs/tags/my-prefix/* - -# Group entries by minor revision, suppress headlines for patch-level revisions -#git-change-log --dense '/[0-9]\+\.[0-9\+$' - -# Trim very old changes -#git-change-log --since 2014-04-01 -#echo '[ Some changelog entries trimmed for brevity ]' - -# Use the subjects (first lines) of tag annotations when no entry would be -# included for a revision otherwise -#git-change-log --auto-add-annotations diff --git a/rpm/BinaryFun.spec b/rpm/BinaryFun.spec deleted file mode 100644 index 2c75d11..0000000 --- a/rpm/BinaryFun.spec +++ /dev/null @@ -1,71 +0,0 @@ -# -# Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.27 -# - -Name: BinaryFun - -# >> macros -# << macros - -%{!?qtc_qmake:%define qtc_qmake %qmake} -%{!?qtc_qmake5:%define qtc_qmake5 %qmake5} -%{!?qtc_make:%define qtc_make make} -%{?qtc_builddir:%define _builddir %qtc_builddir} -Summary: An awesome binary game -Version: 0.1.1 -Release: 1 -Group: Qt/Qt -License: LICENSE -URL: http://example.org/ -Source0: %{name}-%{version}.tar.bz2 -Source100: BinaryFun.yaml -Requires: sailfishsilica-qt5 >= 0.10.9 -BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Qml) -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: desktop-file-utils - -%description -Just type the given decimal number in binary as fast as possible. - - -%prep -%setup -q -n %{name}-%{version} - -# >> setup -# << setup - -%build -# >> build pre -# << build pre - -%qtc_qmake5 - -%qtc_make %{?_smp_mflags} - -# >> build post -# << build post - -%install -rm -rf %{buildroot} -# >> install pre -# << install pre -%qmake5_install - -# >> install post -# << install post - -desktop-file-install --delete-original \ - --dir %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/*.desktop - -%files -%defattr(-,root,root,-) -%{_bindir} -%{_datadir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png -# >> files -# << files diff --git a/rpm/BinaryFun.yaml b/rpm/BinaryFun.yaml deleted file mode 100644 index ef849f9..0000000 --- a/rpm/BinaryFun.yaml +++ /dev/null @@ -1,45 +0,0 @@ -Name: BinaryFun -Summary: An awesome binary game -Version: 0.1.1 -Release: 1 -# The contents of the Group field should be one of the groups listed here: -# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS -Group: Qt/Qt -URL: http://example.org/ -License: LICENSE -# This must be generated before uploading a package to a remote build service. -# Usually this line does not need to be modified. -Sources: -- '%{name}-%{version}.tar.bz2' -Description: | - Just type the given decimal number in binary as fast as possible. -Configure: none -# The qtc5 builder inserts macros to allow QtCreator to have fine -# control over qmake/make execution -Builder: qtc5 - -# This section specifies build dependencies that are resolved using pkgconfig. -# This is the preferred way of specifying build dependencies for your package. -PkgConfigBR: - - sailfishapp >= 1.0.2 - - Qt5Core - - Qt5Qml - - Qt5Quick - -# Build dependencies without a pkgconfig setup can be listed here -# PkgBR: -# - package-needed-to-build - -# Runtime dependencies which are not automatically detected -Requires: - - sailfishsilica-qt5 >= 0.10.9 - -# All installed files -Files: - - '%{_bindir}' - - '%{_datadir}/%{name}' - - '%{_datadir}/applications/%{name}.desktop' - - '%{_datadir}/icons/hicolor/*/apps/%{name}.png' - -# For more information about yaml and what's supported in Sailfish OS -# build system, please see https://wiki.merproject.org/wiki/Spectacle diff --git a/rpm/harbour-binaryfun.spec b/rpm/harbour-binaryfun.spec new file mode 100644 index 0000000..b660eb0 --- /dev/null +++ b/rpm/harbour-binaryfun.spec @@ -0,0 +1,71 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.27 +# + +Name: harbour-binaryfun + +# >> macros +# << macros + +%{!?qtc_qmake:%define qtc_qmake %qmake} +%{!?qtc_qmake5:%define qtc_qmake5 %qmake5} +%{!?qtc_make:%define qtc_make make} +%{?qtc_builddir:%define _builddir %qtc_builddir} +Summary: An awesome binary game +Version: 0.1.1 +Release: 1 +Group: Qt/Qt +License: LICENSE +URL: http://example.org/ +Source0: %{name}-%{version}.tar.bz2 +Source100: harbour-binaryfun.yaml +Requires: sailfishsilica-qt5 >= 0.10.9 +BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: desktop-file-utils + +%description +Just type the given decimal number in binary as fast as possible. + + +%prep +%setup -q -n %{name}-%{version} + +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%qtc_qmake5 + +%qtc_make %{?_smp_mflags} + +# >> build post +# << build post + +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%qmake5_install + +# >> install post +# << install post + +desktop-file-install --delete-original \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/*.desktop + +%files +%defattr(-,root,root,-) +%{_bindir} +%{_datadir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png +# >> files +# << files diff --git a/rpm/harbour-binaryfun.yaml b/rpm/harbour-binaryfun.yaml new file mode 100644 index 0000000..042b43d --- /dev/null +++ b/rpm/harbour-binaryfun.yaml @@ -0,0 +1,45 @@ +Name: harbour-binaryfun +Summary: An awesome binary game +Version: 0.1.1 +Release: 1 +# The contents of the Group field should be one of the groups listed here: +# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS +Group: Qt/Qt +URL: http://example.org/ +License: LICENSE +# This must be generated before uploading a package to a remote build service. +# Usually this line does not need to be modified. +Sources: +- '%{name}-%{version}.tar.bz2' +Description: | + Just type the given decimal number in binary as fast as possible. +Configure: none +# The qtc5 builder inserts macros to allow QtCreator to have fine +# control over qmake/make execution +Builder: qtc5 + +# This section specifies build dependencies that are resolved using pkgconfig. +# This is the preferred way of specifying build dependencies for your package. +PkgConfigBR: + - sailfishapp >= 1.0.2 + - Qt5Core + - Qt5Qml + - Qt5Quick + +# Build dependencies without a pkgconfig setup can be listed here +# PkgBR: +# - package-needed-to-build + +# Runtime dependencies which are not automatically detected +Requires: + - sailfishsilica-qt5 >= 0.10.9 + +# All installed files +Files: + - '%{_bindir}' + - '%{_datadir}/%{name}' + - '%{_datadir}/applications/%{name}.desktop' + - '%{_datadir}/icons/hicolor/*/apps/%{name}.png' + +# For more information about yaml and what's supported in Sailfish OS +# build system, please see https://wiki.merproject.org/wiki/Spectacle -- cgit v1.2.3