[packages/issue-fancy] - {pld,os}-release moved to separate package, update BRs accordingly - all version/name data taken o

[baggins]

commit 42fc9a5acf1a01898d6a777396335e742b0dae7a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jun 16 21:12:59 2013 +0200

    - {pld,os}-release moved to separate package, update BRs accordingly
    - all version/name data taken out from /etc/os-release at build time
    - rel 2

 issue-fancy.spec | 45 +++++----------------------------------------
 1 file changed, 5 insertions(+), 40 deletions(-)
---
diff --git a/issue-fancy.spec b/issue-fancy.spec
index 62515e1..89ba9bb 100644
--- a/issue-fancy.spec
+++ b/issue-fancy.spec
@@ -1,29 +1,12 @@
-
-%bcond_with	snap	# include shapshot information in version,
-			# should be used only in official Th spanhots
-
-%define snapshot	2012
-
-# CPE_NAME = cpe:/ {part} : {vendor} : {product} : {version} : {update} : {edition} : {language}
-# http://cpe.mitre.org/specification/
-# http://csrc.nist.gov/publications/nistir/ir7695/NISTIR-7695-CPE-Naming.pdf
-
-%if %{with snap}
-%define	distname	Th/%{snapshot}
-%define cpename		cpe:/o:pld-linux:pld:%{distversion}:%{snapshot}
-%else
-%define	distname	Th
-%define cpename		cpe:/o:pld-linux:pld:%{distversion}
-%endif
-%define	distversion	3.0
-%define	distrelease	"%{distversion} PLD Linux (%{distname})"
+%define	distnamever	%(. /etc/os-release && echo $VERSION)
+%define	distversion	%(. /etc/os-release && echo $VERSION_ID)
 
 Summary:	PLD Linux release file with logo
 Summary(de.UTF-8):	PLD Linux Release-Datei mit logo
 Summary(pl.UTF-8):	Wersja Linuksa PLD z logiem
 Name:		issue-fancy
 Version:	%{distversion}
-Release:	1%{?with_snap:.%{snapshot}}
+Release:	2
 License:	GPL
 Group:		Base
 Source0:	%{name}-gen
@@ -31,12 +14,12 @@ Source1:	%{name}.crontab
 Source2:	%{name}.init
 # In fact it requires quote_logo_backslashes patch.
 BuildRequires:	linux_logo >= 3.9b5
+BuildRequires:	pld-release >= 3.0
+%requires_eq	pld-release
 Requires(post,preun):	/sbin/chkconfig
 Requires:	linux_logo >= 3.9b5
 Requires:	crondaemon
 Provides:	issue
-Provides:	issue-package
-Obsoletes:	issue-package
 Conflicts:	issue-alpha < 3.0-1
 Conflicts:	issue-logo < 3.0-1
 Conflicts:	issue-nice < 3.0-1
@@ -64,22 +47,6 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/issue-fancy
 
 $RPM_BUILD_ROOT%{_sbindir}/issue-fancy-gen $RPM_BUILD_ROOT
 
-echo %{distrelease} > $RPM_BUILD_ROOT%{_sysconfdir}/pld-release
-
-# CPE_NAME = cpe:/ {part} : {vendor} : {product} : {version} : {update} : {edition} : {language}
-# http://cpe.mitre.org/specification/
-cat >$RPM_BUILD_ROOT%{_sysconfdir}/os-release <<EOF
-NAME="PLD Linux"
-VERSION="%{distversion} (%{distname})"
-ID="pld"
-VERSION_ID="%{distversion}"
-PRETTY_NAME="PLD Linux %{distversion} (%{distname})"
-ANSI_COLOR="0;32"
-CPE_NAME="%{cpename}"
-HOME_URL="http://www.pld-linux.org/"
-BUG_REPORT_URL="http://bugs.pld-linux.org/"
-EOF
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -94,8 +61,6 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%{_sysconfdir}/os-release
-%{_sysconfdir}/pld-release
 # Can't use "noreplace" here because issues are regenerated from cron
 # and %post. Without "noreplace" at least ".rpmsave" will stay.
 %config %verify(not md5 mtime size) %{_sysconfdir}/issue
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/issue-fancy.git/commitdiff/42fc9a5acf1a01898d6a777396335e742b0dae7a