From b854bc02178d267f68e2340eadbccc3dcbca13fd3dc936d42ebb3682d54bc653 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 7 Sep 2010 08:03:35 +0000 Subject: [PATCH] use fedora style pre release versioning OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=22 --- lirc-kernel.spec | 15 +++++---------- lirc.spec | 15 +++++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/lirc-kernel.spec b/lirc-kernel.spec index 0b5ceab..7985cd2 100644 --- a/lirc-kernel.spec +++ b/lirc-kernel.spec @@ -18,21 +18,16 @@ # norootforbuild # icecream 0 -%define snapshot 0.8.7-pre3 -%if 0%{?snapshot:1} -%define snapshot_rpmver %{lua: \ -v=string.gsub(rpm.expand("%snapshot"), "-", "") \ -print (v) } -%endif +%define snapshot pre3 Name: lirc-kernel BuildRequires: kernel-source kernel-syms module-init-tools License: GPLv2+ Group: System/Kernel Summary: LIRC kernel modules -Version: 0.8.6%{?snapshot:_%snapshot_rpmver} -Release: 1 -Source0: lirc-%{?snapshot}%{!?snapshot:%version}.tar.bz2 +Version: 0.8.7 +Release: %{?snapshot:0.}.%{?snapshot:.%snapshot} +Source0: http://downloads.sourceforge.net/project/lirc/LIRC/%version/lirc-%version%{?snapshot:-%snapshot}.tar.bz2 Source1: Makefile.module Source2: Makefile.modsub BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,7 +52,7 @@ receivers for the serial port. %prep -%setup -q -n lirc-%{?snapshot}%{!?snapshot:%version} +%setup -q -n lirc-%{version}%{?snapshot:-%snapshot} autoreconf -f -i PYTHON=/usr/bin/python \ ./configure --with-driver=all diff --git a/lirc.spec b/lirc.spec index 392c248..feda05f 100644 --- a/lirc.spec +++ b/lirc.spec @@ -17,12 +17,7 @@ # norootforbuild -%define snapshot 0.8.7-pre3 -%if 0%{?snapshot:1} -%define snapshot_rpmver %{lua: \ -v=string.gsub(rpm.expand("%snapshot"), "-", "") \ -print (v) } -%endif +%define snapshot pre3 Name: lirc BuildRequires: alsa-devel xorg-x11-devel @@ -57,11 +52,11 @@ AutoReqProv: on Obsoletes: lirc-64bit %endif # -Version: 0.8.6%{?snapshot:_%snapshot_rpmver} -Release: 1 +Version: 0.8.7 +Release: %{?snapshot:0.}.%{?snapshot:.%snapshot} PreReq: %fillup_prereq %insserv_prereq Summary: Tools for Infrared Receivers -Source0: http://downloads.sourceforge.net/project/lirc/LIRC/%version/lirc-%{?snapshot}%{!?snapshot:%version}.tar.bz2 +Source0: http://downloads.sourceforge.net/project/lirc/LIRC/%version/lirc-%version%{?snapshot:-%snapshot}.tar.bz2 Source1: baselibs.conf Source4: rc.lirc Source5: sysconfig.lirc @@ -129,7 +124,7 @@ the 'lirc' package has to be configured and started. %prep -%setup -q -n %{name}-%{?snapshot}%{!?snapshot:%version} +%setup -q -n %{name}-%{version}%{?snapshot:-%snapshot} #%patch0 -p1 -b .hw %patch2 -p1 cp %{SOURCE8} .