diff --git a/README.packaging b/README.packaging deleted file mode 100644 index ff4f5f3..0000000 --- a/README.packaging +++ /dev/null @@ -1,10 +0,0 @@ -This file contains information for OpenBuildService packagers. - -To update this package from git, run the file update.sh - -It pulls the latest version from github, assigns a date-based version -number, removes previous tarball and creates a new one, inputs the -version number in the spec file, and notes the version bump in changelog. - -In the future, changelog should also be maintained in git and auto-dumped -into the changes file. diff --git a/_service b/_service new file mode 100644 index 0000000..10767bb --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + git://github.com/openSUSE/python-rpm-macros.git + git + .git + master + %cd.%h + enable + python-rpm-macros + + + python-rpm-macros-*.tar + bz2 + + + python-rpm-macros + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..945b3fa --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + git://github.com/openSUSE/python-rpm-macros.git + ab6f37cab7f992b3ad8a148877854129e0c0cd4b \ No newline at end of file diff --git a/python-rpm-macros-2018.08.15.ada6d63.tar.bz2 b/python-rpm-macros-2018.08.15.ada6d63.tar.bz2 deleted file mode 100644 index 8470426..0000000 --- a/python-rpm-macros-2018.08.15.ada6d63.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b4efc1a276f5d950c2a138ca5b538468558ff2313c8e605489ca6e9df85b403 -size 13714 diff --git a/python-rpm-macros-20181211.ab6f37c.tar.bz2 b/python-rpm-macros-20181211.ab6f37c.tar.bz2 new file mode 100644 index 0000000..12f5799 --- /dev/null +++ b/python-rpm-macros-20181211.ab6f37c.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38fcf09a0352db88b1482b609945bf8ad46a28b5c5214484c130780275091fc4 +size 12467 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index ccd90b4..72a6687 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Dec 11 11:27:17 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 20181211.ab6f37c: + * Fix an issue with epoch printing having too many \ + * Remove packaging/ dir + +------------------------------------------------------------------- +Mon Dec 10 20:09:43 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 1540475376.149a499: + * add epoch while printing "Provides:" +- Update URL +- Add _service and use the tar_scm/recompress/set_version source + services to update the package. + Package updates can now be done with "osc service run" +- Drop README.packaging +- Drop update.sh . This is now handled via the source services + ------------------------------------------------------------------- Wed Oct 24 07:20:44 UTC 2018 - sjamgade@suse.com diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index d16366d..e88407d 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -12,20 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: python-rpm-macros -Version: 2018.08.15.ada6d63 +Version: 20181211.ab6f37c Release: 0 Summary: RPM macros for building of Python modules License: WTFPL Group: Development/Tools/Other -Url: https://github.com/opensuse/multipython-macros +Url: https://github.com/opensuse/python-rpm-macros Source: python-rpm-macros-%{version}.tar.bz2 -Source100: README.packaging -Source101: update.sh # Fedora compatibility Provides: python2-rpm-macros Provides: python3-rpm-macros diff --git a/update.sh b/update.sh deleted file mode 100644 index 5fd4862..0000000 --- a/update.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -GIT_URL=https://github.com/openSUSE/python-rpm-macros.git -SPEC_FILE_NAME=python-rpm-macros.spec - -PREV_VERSION=$(sed -rn 's/^Version:\s+(.*)$/\1/p' $SPEC_FILE_NAME) -rm python-rpm-macros-$PREV_VERSION.tar.bz2 - -tmpdir=tmp.$RANDOM - -git clone --depth=1 $GIT_URL $tmpdir -cd $tmpdir -cp packaging/* .. - -VERSION=$(git log -n 1 --date=format:%Y.%m.%d --format=format:%cd.%h) -git archive --format=tar --prefix=python-rpm-macros-$VERSION/ HEAD \ - | bzip2 -c > ../python-rpm-macros-$VERSION.tar.bz2 - -cd .. -rm -rf $tmpdir -sed -i -r 's/^(Version:\s+)(.*)$/\1'$VERSION'/' $SPEC_FILE_NAME - -osc vc -m "version bump to $VERSION"