Author: patrys                       Date: Wed Aug  8 11:51:25 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add conflicts where affected
- add P/O issue-package
- rel up

---- Files affected:
SPECS:
   issue.spec (1.49 -> 1.50) , issue-alpha.spec (1.18 -> 1.19) , 
issue-fancy.spec (1.24 -> 1.25) , issue-logo.spec (1.27 -> 1.28) , 
issue-pure.spec (1.31 -> 1.32) , issue-nice.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/issue.spec
diff -u SPECS/issue.spec:1.49 SPECS/issue.spec:1.50
--- SPECS/issue.spec:1.49       Sun Aug  5 22:42:13 2007
+++ SPECS/issue.spec    Wed Aug  8 13:51:20 2007
@@ -26,15 +26,21 @@
 Summary(zh_CN.UTF-8):  PLD Linux 版本文件。
 Name:          issue
 Version:       %{distversion}
-Release:       2
+Release:       3
 License:       GPL
 Group:         Base
+Provides:      issue-package
 Obsoletes:     issue-alpha
 Obsoletes:     issue-fancy
 Obsoletes:     issue-logo
+Obsoletes:     issue-package
 Obsoletes:     issue-pure
 Obsoletes:     mandrake-release
 Obsoletes:     redhat-release
+Conflicts:     issue-alpha < 2.99-2
+Conflicts:     issue-fancy < 2.99-2
+Conflicts:     issue-logo < 2.99-2
+Conflicts:     issue-pure < 2.99-5
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -142,6 +148,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2007/08/08 11:51:20  patrys
+- add conflicts where affected
+- add P/O issue-package
+- rel up
+
 Revision 1.49  2007/08/05 20:42:13  wolvverine
 -rel.2
 

================================================================
Index: SPECS/issue-alpha.spec
diff -u SPECS/issue-alpha.spec:1.18 SPECS/issue-alpha.spec:1.19
--- SPECS/issue-alpha.spec:1.18 Mon Aug  6 12:33:35 2007
+++ SPECS/issue-alpha.spec      Wed Aug  8 13:51:20 2007
@@ -8,12 +8,17 @@
 Summary(pl.UTF-8):     Wersja Linuksa PLD z wirtualną klawiaturą
 Name:          issue-alpha
 Version:       %{distversion}
-Release:       2
+Release:       3
 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
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -69,6 +74,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2007/08/08 11:51:20  patrys
+- add conflicts where affected
+- add P/O issue-package
+- rel up
+
 Revision 1.18  2007/08/06 10:33:35  patrys
 - drop obsoletes and duplicate deps
 - provide issue

================================================================
Index: SPECS/issue-fancy.spec
diff -u SPECS/issue-fancy.spec:1.24 SPECS/issue-fancy.spec:1.25
--- SPECS/issue-fancy.spec:1.24 Mon Aug  6 12:32:26 2007
+++ SPECS/issue-fancy.spec      Wed Aug  8 13:51:20 2007
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):     Wersja Linuksa PLD z logiem
 Name:          issue-fancy
 Version:       %{distversion}
-Release:       2
+Release:       3
 License:       GPL
 Group:         Base
 Source0:       %{name}-gen
@@ -17,15 +17,19 @@
 Source2:       %{name}.init
 # In fact it requires quote_logo_backslashes patch.
 BuildRequires: linux_logo >= 3.9b5
-PreReq:                rc-scripts
 Requires(post,preun):  /sbin/chkconfig
 Requires:      linux_logo >= 3.9b5
 Requires:      crondaemon
-BuildArch:     noarch
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 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
+BuildArch:     noarch
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir        /sbin
 
@@ -77,6 +81,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2007/08/08 11:51:20  patrys
+- add conflicts where affected
+- add P/O issue-package
+- rel up
+
 Revision 1.24  2007/08/06 10:32:26  patrys
 - drop obsoletes
 - provide issue

================================================================
Index: SPECS/issue-logo.spec
diff -u SPECS/issue-logo.spec:1.27 SPECS/issue-logo.spec:1.28
--- SPECS/issue-logo.spec:1.27  Mon Aug  6 12:31:06 2007
+++ SPECS/issue-logo.spec       Wed Aug  8 13:51:20 2007
@@ -9,12 +9,15 @@
 Summary(pl.UTF-8):     Wersja Linuksa PLD z logiem
 Name:          issue-logo
 Version:       %{distversion}
-Release:       2
+Release:       3
 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
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -75,6 +78,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2007/08/08 11:51:20  patrys
+- add conflicts where affected
+- add P/O issue-package
+- rel up
+
 Revision 1.27  2007/08/06 10:31:06  patrys
 - provide issue
 - drop obsoletes

================================================================
Index: SPECS/issue-pure.spec
diff -u SPECS/issue-pure.spec:1.31 SPECS/issue-pure.spec:1.32
--- SPECS/issue-pure.spec:1.31  Mon Aug  6 12:28:20 2007
+++ SPECS/issue-pure.spec       Wed Aug  8 13:51:20 2007
@@ -26,12 +26,17 @@
 Summary(zh_CN.UTF-8):  PLD Linux 版本文件。
 Name:          issue-pure
 Version:       %{distversion}
-Release:       5
+Release:       6
 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
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -130,6 +135,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2007/08/08 11:51:20  patrys
+- add conflicts where affected
+- add P/O issue-package
+- rel up
+
 Revision 1.31  2007/08/06 10:28:20  patrys
 - don't obsolete valid packages
 

================================================================
Index: SPECS/issue-nice.spec
diff -u SPECS/issue-nice.spec:1.27 SPECS/issue-nice.spec:1.28
--- SPECS/issue-nice.spec:1.27  Mon Aug  6 12:29:22 2007
+++ SPECS/issue-nice.spec       Wed Aug  8 13:51:20 2007
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):     Ładna wersja Linuksa PLD
 Name:          issue-nice
 Version:       %{distversion}
-Release:       2
+Release:       3
 License:       GPL
 Group:         Base
 Source0:       issue-make.sh
@@ -33,10 +33,13 @@
 Requires:      fbgetty
 Requires:      fbv >= 0.99-2
 Requires:      which
-BuildArch:     noarch
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Provides:      issue
+Provides:      issue-package
+Obsoletes:     issue-package
 Obsoletes:     redhat-release
 Obsoletes:     mandrake-release
+BuildArch:     noarch
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Nice (and big) PLD Linux release file.
@@ -256,6 +259,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2007/08/08 11:51:20  patrys
+- add conflicts where affected
+- add P/O issue-package
+- rel up
+
 Revision 1.27  2007/08/06 10:29:22  patrys
 - don't obsolete valid packages
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/issue.spec?r1=1.49&r2=1.50&f=u
    http://cvs.pld-linux.org/SPECS/issue-alpha.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/issue-fancy.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/issue-logo.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SPECS/issue-pure.spec?r1=1.31&r2=1.32&f=u
    http://cvs.pld-linux.org/SPECS/issue-nice.spec?r1=1.27&r2=1.28&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to