From 92ae2e2eb4e75e43c42c44d3ed4329f30b3c8dec3cac18908685978f908603d8 Mon Sep 17 00:00:00 2001
From: Mia Herkt <9+suse@cirno.systems>
Date: Tue, 9 Jan 2018 06:11:21 +0000
Subject: [PATCH] - Switch to 0.4.1 release tarball, remove _service files

OBS-URL: https://build.opensuse.org/package/show/server:irc/bitlbee-discord?expand=0&rev=4
---
 _service                                | 17 -----------------
 _servicedata                            |  4 ----
 bitlbee-discord-0.4.1+0.g3e435b0.tar.xz |  3 ---
 bitlbee-discord-0.4.1.tar.gz            |  3 +++
 bitlbee-discord.changes                 |  8 ++------
 bitlbee-discord.spec                    | 13 ++++++-------
 6 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 _service
 delete mode 100644 _servicedata
 delete mode 100644 bitlbee-discord-0.4.1+0.g3e435b0.tar.xz
 create mode 100644 bitlbee-discord-0.4.1.tar.gz

diff --git a/_service b/_service
deleted file mode 100644
index 57daf5c..0000000
--- a/_service
+++ /dev/null
@@ -1,17 +0,0 @@
-<services>
-  <service name="tar_scm" mode="localonly">
-    <param name="filename">bitlbee-discord</param>
-    <param name="versionformat">0.4.1+@TAG_OFFSET@.g%h</param>
-    <!-- not a tag: 0.4.1 version bump commit -->
-    <param name="parent-tag">3e435b0c6b24d57766d52c12d0fab5f69068c1ef</param>
-    <param name="url">git://github.com/sm00th/bitlbee-discord.git</param>
-    <param name="scm">git</param>
-    <param name="revision">master</param>
-    <param name="changesgenerate">enable</param>
-  </service>
-  <service name="recompress" mode="localonly">
-    <param name="compression">xz</param>
-    <param name="file">*.tar</param>
-  </service>
-  <service name="set_version" mode="localonly"/>
-</services>
diff --git a/_servicedata b/_servicedata
deleted file mode 100644
index 26a7603..0000000
--- a/_servicedata
+++ /dev/null
@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">git://github.com/sm00th/bitlbee-discord.git</param>
-              <param name="changesrevision">3e435b0c6b24d57766d52c12d0fab5f69068c1ef</param></service></servicedata>
\ No newline at end of file
diff --git a/bitlbee-discord-0.4.1+0.g3e435b0.tar.xz b/bitlbee-discord-0.4.1+0.g3e435b0.tar.xz
deleted file mode 100644
index b12fbde..0000000
--- a/bitlbee-discord-0.4.1+0.g3e435b0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7cf494e76ce90e204c2af2bcbeaf9ea35055b41105ce6225c5d0fa0917df785
-size 24804
diff --git a/bitlbee-discord-0.4.1.tar.gz b/bitlbee-discord-0.4.1.tar.gz
new file mode 100644
index 0000000..3f17c38
--- /dev/null
+++ b/bitlbee-discord-0.4.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1872804091dcdb4effa3ae29ea82dee37cd65b2c9f0e313394372671eed98af
+size 28577
diff --git a/bitlbee-discord.changes b/bitlbee-discord.changes
index 5075f91..def677a 100644
--- a/bitlbee-discord.changes
+++ b/bitlbee-discord.changes
@@ -1,11 +1,7 @@
 -------------------------------------------------------------------
-Sun Jan 07 05:23:23 UTC 2018 - 9@cirno.systems
+Tue Jan  9 06:10:37 UTC 2018 - 9@cirno.systems
 
-- Change version format of _service file: version+offset.gh
-  * Filed upstream issue to tag version bumps in the future so that
-    we can hopefully stop packaging random Git commits, or at least
-    use them for PARENT_TAG
-- Update to version 0.4.1+0.g3e435b0:
+- Switch to 0.4.1 release tarball, remove _service files
   * Allow getting backlog of private messages
   * Fix use-after-free on OPCODE_RECONNECT/INVALID_SESSION
 
diff --git a/bitlbee-discord.spec b/bitlbee-discord.spec
index 02cb5d0..36fd3b0 100644
--- a/bitlbee-discord.spec
+++ b/bitlbee-discord.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bitlbee-discord
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,22 +15,22 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define         github_user sm00th
 %define         short_name discord
 Name:           bitlbee-%{short_name}
-Version:        0.4.1+0.g3e435b0
+Version:        0.4.1
 Release:        0
 Summary:        Bitlbee plugin for Discord
 License:        GPL-2.0
 Group:          Productivity/Networking/IRC
-Url:            https://github.com/%{github_user}/%{name}
-Source:         https://github.com/%{github_user}/%{name}/%{name}-%{version}.tar.xz
+URL:            https://github.com/%{github_user}/%{name}
+Source:         https://github.com/%{github_user}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(bitlbee)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Bitlbee plugin for Discord.
@@ -44,11 +44,10 @@ Bitlbee plugin for Discord.
 make %{?_smp_mflags}
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 rm %{buildroot}%{_libdir}/bitlbee/%{short_name}.la
 
 %files
-%defattr(-,root,root)
 %doc LICENSE README
 %dir %{_libdir}/bitlbee
 %{_libdir}/bitlbee/%{short_name}.so