packages: issue-pure/issue-pure.spec, issue-nice/issue-nice.spec, issue-log...

baggins baggins at pld-linux.org
Thu Feb 16 11:49:03 CET 2012 

Author: baggins                      Date: Thu Feb 16 10:49:03 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- relup
- drop foreign obsoletes
- add /etc/os-release (http://www.freedesktop.org/software/systemd/man/os-release.html)

---- Files affected:
packages/issue-pure:
   issue-pure.spec (1.32 -> 1.33) 
packages/issue-nice:
   issue-nice.spec (1.29 -> 1.30) 
packages/issue-logo:
   issue-logo.spec (1.28 -> 1.29) 
packages/issue-livecd:
   issue-livecd.spec (1.5 -> 1.6) 
packages/issue-fancy:
   issue-fancy.spec (1.26 -> 1.27) 
packages/issue-alpha:
   issue-alpha.spec (1.19 -> 1.20) 
packages/issue:
   issue.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: packages/issue-pure/issue-pure.spec
diff -u packages/issue-pure/issue-pure.spec:1.32 packages/issue-pure/issue-pure.spec:1.33
--- packages/issue-pure/issue-pure.spec:1.32	Wed Aug  8 13:51:20 2007
+++ packages/issue-pure/issue-pure.spec	Thu Feb 16 11:48:58 2012
@@ -26,14 +26,12 @@
 Summary(zh_CN.UTF-8):	PLD Linux 版本文件。
 Name:		issue-pure
 Version:	%{distversion}
-Release:	6
+Release:	7
 License:	GPL
 Group:		Base
 Provides:	issue
 Provides:	issue-package
 Obsoletes:	issue-package
-Obsoletes:	mandrake-release
-Obsoletes:	redhat-release
 Conflicts:	issue-alpha < 2.99-2
 Conflicts:	issue-fancy < 2.99-2
 Conflicts:	issue-logo < 2.99-2
@@ -119,13 +117,27 @@
 Welcome to %h
 
 EOF
+
 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="cpe:/o:pld-linux:pld:%{distversion}"
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%{_sysconfdir}/os-release
 %{_sysconfdir}/pld-release
 %config(noreplace) %{_sysconfdir}/issue*
 
@@ -135,6 +147,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2012/02/16 10:48:58  baggins
+- relup
+- drop foreign obsoletes
+- add /etc/os-release (http://www.freedesktop.org/software/systemd/man/os-release.html)
+
 Revision 1.32  2007/08/08 11:51:20  patrys
 - add conflicts where affected
 - add P/O issue-package

================================================================
Index: packages/issue-nice/issue-nice.spec
diff -u packages/issue-nice/issue-nice.spec:1.29 packages/issue-nice/issue-nice.spec:1.30
--- packages/issue-nice/issue-nice.spec:1.29	Mon Jun 20 20:59:59 2011
+++ packages/issue-nice/issue-nice.spec	Thu Feb 16 11:48:58 2012
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	Ładna wersja Linuksa PLD
 Name:		issue-nice
 Version:	%{distversion}
-Release:	3
+Release:	4
 License:	GPL
 Group:		Base
 Source0:	issue-make.sh
@@ -37,8 +37,6 @@
 Provides:	issue
 Provides:	issue-package
 Obsoletes:	issue-package
-Obsoletes:	redhat-release
-Obsoletes:	mandrake-release
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -225,6 +223,18 @@
 
 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="cpe:/o:pld-linux:pld:%{distversion}"
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -237,6 +247,7 @@
 
 %files
 %defattr(644,root,root,755)
+%{_sysconfdir}/os-release
 %{_sysconfdir}/pld-release
 %config(noreplace) %{_sysconfdir}/issue*
 %dir %{data}
@@ -260,6 +271,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2012/02/16 10:48:58  baggins
+- relup
+- drop foreign obsoletes
+- add /etc/os-release (http://www.freedesktop.org/software/systemd/man/os-release.html)
+
 Revision 1.29  2011/06/20 18:59:59  draenog
 - move big, compressed sources to distfiles
 

================================================================
Index: packages/issue-logo/issue-logo.spec
diff -u packages/issue-logo/issue-logo.spec:1.28 packages/issue-logo/issue-logo.spec:1.29
--- packages/issue-logo/issue-logo.spec:1.28	Wed Aug  8 13:51:20 2007
+++ packages/issue-logo/issue-logo.spec	Thu Feb 16 11:48:58 2012
@@ -9,12 +9,10 @@
 Summary(pl.UTF-8):	Wersja Linuksa PLD z logiem
 Name:		issue-logo
 Version:	%{distversion}
-Release:	3
+Release:	4
 License:	GPL
 Group:		Base
 Provides:	issue
-Obsoletes:	mandrake-release
-Obsoletes:	redhat-release
 Conflicts:	issue-alpha < 2.99-2
 Conflicts:	issue-fancy < 2.99-2
 Conflicts:	issue-pure < 2.99-5
@@ -48,6 +46,7 @@
     |
 
 EOF
+
 echo -ne "\l " >> $RPM_BUILD_ROOT%{_sysconfdir}/issue
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue.net <<EOF
@@ -62,13 +61,27 @@
     |
 
 EOF
+
 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="cpe:/o:pld-linux:pld:%{distversion}"
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%{_sysconfdir}/os-release
 %{_sysconfdir}/pld-release
 %config(noreplace) %{_sysconfdir}/issue*
 
@@ -78,6 +91,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2012/02/16 10:48:58  baggins
+- relup
+- drop foreign obsoletes
+- add /etc/os-release (http://www.freedesktop.org/software/systemd/man/os-release.html)
+
 Revision 1.28  2007/08/08 11:51:20  patrys
 - add conflicts where affected
 - add P/O issue-package

================================================================
Index: packages/issue-livecd/issue-livecd.spec
diff -u packages/issue-livecd/issue-livecd.spec:1.5 packages/issue-livecd/issue-livecd.spec:1.6
--- packages/issue-livecd/issue-livecd.spec:1.5	Tue Feb 13 09:06:35 2007
+++ packages/issue-livecd/issue-livecd.spec	Thu Feb 16 11:48:59 2012
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Wersja PLD LiveCD z logiem
 Name:		issue-livecd
 Version:	%{distversion}
-Release:	1
+Release:	2
 License:	GPL
 Group:		Base
 Provides:	issue
@@ -17,8 +17,6 @@
 Obsoletes:	issue-fancy
 Obsoletes:	issue-logo
 Obsoletes:	issue-pure
-Obsoletes:	mandrake-release
-Obsoletes:	redhat-release
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -49,6 +47,7 @@
     |
 
 EOF
+
 echo -ne "\l " >> $RPM_BUILD_ROOT%{_sysconfdir}/issue
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue.net <<EOF
@@ -63,13 +62,27 @@
     |
 
 EOF
+
 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="cpe:/o:pld-linux:pld:%{distversion}"
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%{_sysconfdir}/os-release
 %{_sysconfdir}/pld-release
 %config(noreplace) %{_sysconfdir}/issue*
 
@@ -79,6 +92,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2012/02/16 10:48:59  baggins
+- relup
+- drop foreign obsoletes
+- add /etc/os-release (http://www.freedesktop.org/software/systemd/man/os-release.html)
+
 Revision 1.5  2007/02/13 08:06:35  glen
 - tabs in preamble
 

================================================================
Index: packages/issue-fancy/issue-fancy.spec
diff -u packages/issue-fancy/issue-fancy.spec:1.26 packages/issue-fancy/issue-fancy.spec:1.27
--- packages/issue-fancy/issue-fancy.spec:1.26	Tue Nov 18 21:48:49 2008
+++ packages/issue-fancy/issue-fancy.spec	Thu Feb 16 11:48:59 2012
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Wersja Linuksa PLD z logiem
 Name:		issue-fancy
 Version:	%{distversion}
-Release:	4
+Release:	5
 License:	GPL
 Group:		Base
 Source0:	%{name}-gen
@@ -23,8 +23,6 @@
 Provides:	issue
 Provides:	issue-package
 Obsoletes:	issue-package
-Obsoletes:	redhat-release
-Obsoletes:	mandrake-release
 Conflicts:	issue-alpha < 2.99-2
 Conflicts:	issue-logo < 2.99-2
 Conflicts:	issue-pure < 2.99-5
@@ -53,6 +51,18 @@
 
 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="cpe:/o:pld-linux:pld:%{distversion}"
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -67,6 +77,7 @@
 
 %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.
@@ -82,6 +93,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2012/02/16 10:48:59  baggins
+- relup
+- drop foreign obsoletes
+- add /etc/os-release (http://www.freedesktop.org/software/systemd/man/os-release.html)
+
 Revision 1.26  2008/11/18 20:48:49  sls
 - not verify md5+mtime+size for regenereted issue files (BTW - what's point
   to config these files?)

================================================================
Index: packages/issue-alpha/issue-alpha.spec
diff -u packages/issue-alpha/issue-alpha.spec:1.19 packages/issue-alpha/issue-alpha.spec:1.20
--- packages/issue-alpha/issue-alpha.spec:1.19	Wed Aug  8 13:51:20 2007
+++ packages/issue-alpha/issue-alpha.spec	Thu Feb 16 11:48:59 2012
@@ -8,14 +8,12 @@
 Summary(pl.UTF-8):	Wersja Linuksa PLD z wirtualną klawiaturą
 Name:		issue-alpha
 Version:	%{distversion}
-Release:	3
+Release:	4
 License:	GPL
 Group:		Base
 Provides:	issue
 Provides:	issue-package
 Obsoletes:	issue-package
-Obsoletes:	redhat-release
-Obsoletes:	mandrake-release
 Conflicts:	issue-fancy < 2.99-2
 Conflicts:	issue-logo < 2.99-2
 Conflicts:	issue-pure < 2.99-5
@@ -60,11 +58,24 @@
 
 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="cpe:/o:pld-linux:pld:%{distversion}"
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%{_sysconfdir}/os-release
 %{_sysconfdir}/pld-release
 %config(noreplace) %{_sysconfdir}/issue*
 
@@ -74,6 +85,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2012/02/16 10:48:59  baggins
+- relup
+- drop foreign obsoletes
+- add /etc/os-release (http://www.freedesktop.org/software/systemd/man/os-release.html)
+
 Revision 1.19  2007/08/08 11:51:20  patrys
 - add conflicts where affected
 - add P/O issue-package

================================================================
Index: packages/issue/issue.spec
diff -u packages/issue/issue.spec:1.52 packages/issue/issue.spec:1.53
--- packages/issue/issue.spec:1.52	Thu Feb 16 11:44:09 2012
+++ packages/issue/issue.spec	Thu Feb 16 11:48:59 2012
@@ -26,7 +26,7 @@
 Summary(zh_CN.UTF-8):	PLD Linux 版本文件。
 Name:		issue
 Version:	%{distversion}
-Release:	3
+Release:	4
 License:	GPL
 Group:		Base
 Provides:	issue-package
@@ -159,6 +159,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2012/02/16 10:48:59  baggins
+- relup
+- drop foreign obsoletes
+- add /etc/os-release (http://www.freedesktop.org/software/systemd/man/os-release.html)
+
 Revision 1.52  2012/02/16 10:44:09  baggins
 - added /etc/os-release (http://www.freedesktop.org/software/systemd/man/os-release.html)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/issue-pure/issue-pure.spec?r1=1.32&r2=1.33&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/issue-nice/issue-nice.spec?r1=1.29&r2=1.30&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/issue-logo/issue-logo.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/issue-livecd/issue-livecd.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/issue-fancy/issue-fancy.spec?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/issue-alpha/issue-alpha.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/issue/issue.spec?r1=1.52&r2=1.53&f=u

More information about the pld-cvs-commit mailing list