Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 utils/hwdata/0001-remove-invocation-of-git-remove-exit-1-at-end-of-Mak.patch 
|   39 ----------
 utils/hwdata/DETAILS                                                         
|   12 +--
 utils/hwdata/HISTORY                                                         
|    6 +
 utils/hwdata/PRE_BUILD                                                       
|    3 
 4 files changed, 13 insertions(+), 47 deletions(-)

New commits:
commit 522ee784c9ead5250dcdb3edc8b14e29bd99ec98
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    hwdata: => v0.307

diff --git 
a/utils/hwdata/0001-remove-invocation-of-git-remove-exit-1-at-end-of-Mak.patch
 
b/utils/hwdata/0001-remove-invocation-of-git-remove-exit-1-at-end-of-Mak.patch
deleted file mode 100644
index 23d2e80..0000000
--- 
a/utils/hwdata/0001-remove-invocation-of-git-remove-exit-1-at-end-of-Mak.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4b38c274e174b0428b66f2c6c324050c385d1aa5 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.net>
-Date: Fri, 18 Sep 2015 20:52:20 +0200
-Subject: [PATCH] remove invocation of git, remove exit 1 at end of
- Makefile.inc rule
-
----
- Makefile | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2584ba7..87e3e0f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,12 +1,7 @@
- NAME=hwdata
- VERSION=$(shell awk '/Version:/ { print $$2 }' hwdata.spec)
- RELEASE=$(shell rpm -q --define 'dist %{nil}' --specfile --qf "%{release}" 
hwdata.spec)
--ifeq ($(shell git rev-parse --abbrev-ref HEAD | sed -n 
's/^\([^0-9-]\+\).*/\L\1/p'), rhel)
--    # add revision to tag name for rhel branches
--    TAGNAME := $(NAME)-$(VERSION)-$(RELEASE)
--else
--    TAGNAME := $(NAME)-$(VERSION)
--endif
-+TAGNAME := $(NAME)-$(VERSION)
- SOURCEDIR := $(shell pwd)
- ARCHIVE := $(TAGNAME).tar.bz2
- 
-@@ -26,7 +21,6 @@ all:
- Makefile.inc: configure
-       ./configure
-       @echo "$@ generated. Run the make again."
--      @exit 1
- 
- install: Makefile.inc
-       mkdir -p -m 755 $(DESTDIR)$(datadir)/$(NAME)
--- 
-2.5.2
-
diff --git a/utils/hwdata/DETAILS b/utils/hwdata/DETAILS
index 0967779..d30b0c5 100755
--- a/utils/hwdata/DETAILS
+++ b/utils/hwdata/DETAILS
@@ -1,11 +1,11 @@
            SPELL=hwdata
-         VERSION=0.291
-     
SOURCE_HASH=sha512:2be5364a992806f7cdab502b4cf99c3fe3ac64472565960de0def900cc4290806123736972e9e8fba0d340b36c28f3251aa2b1a3080f745763bfa668054ff3af
-          SOURCE=$SPELL-$VERSION.tar.xz
+         VERSION=0.307
+     
SOURCE_HASH=sha512:dd53a8e12b1208acbfaf1da991440bc2e376f28d7fc3c695948d36f6b1effd2d29a276865d2cb9bec07ccaf21e92c4e515d7d5629cb9cc7585df811e8261eb1c
+          SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   
SOURCE_URL[0]=https://git.fedorahosted.org/cgit/hwdata.git/snapshot/$SOURCE
-        WEB_SITE=http://fedorahosted.org/hwdata/
-         ENTERED=20020707
+         WEB_SITE=https://github.com/vcrhonek/hwdata
+   SOURCE_URL[0]=$WEB_SITE/archive/v$VERSION.tar.gz
+        ENTERED=20020707
       LICENSE[0]="GPL"
       LICENSE[1]="XCL"
         KEYWORDS="utils"
diff --git a/utils/hwdata/HISTORY b/utils/hwdata/HISTORY
index 72cb31a..47f30f7 100644
--- a/utils/hwdata/HISTORY
+++ b/utils/hwdata/HISTORY
@@ -1,3 +1,9 @@
+2017-12-28 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.307
+         now at github
+       * 0001-remove-invocation-of-git-remove-exit-1-at-end-of-Mak.patch: 
deleted
+       * PRE_BUILD: simplify, use sed, patch
+
 2017-02-05 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.291
 
diff --git a/utils/hwdata/PRE_BUILD b/utils/hwdata/PRE_BUILD
index c62571d..8e047b0 100755
--- a/utils/hwdata/PRE_BUILD
+++ b/utils/hwdata/PRE_BUILD
@@ -1,4 +1,3 @@
 default_pre_build      &&
 cd ${SOURCE_DIRECTORY} &&
-
-patch -p1 < 
${SPELL_DIRECTORY}/0001-remove-invocation-of-git-remove-exit-1-at-end-of-Mak.patch
+sed -i '/RELEASE/,/CVSTAG/D;/@exit 1/D' Makefile