Author: glen Date: Sat Mar 5 11:30:37 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- remove obsolete rpm-pythonprov / macros.python
---- Files affected:
SPECS:
adapter.spec (1.12 -> 1.13) , adapter.awk (1.139 -> 1.140)
---- Diffs:
================================================================
Index: SPECS/adapter.spec
diff -u SPECS/adapter.spec:1.12 SPECS/adapter.spec:1.13
--- SPECS/adapter.spec:1.12 Wed Mar 2 23:23:49 2005
+++ SPECS/adapter.spec Sat Mar 5 12:30:31 2005
@@ -3,6 +3,7 @@
%bcond_with tests # build with tests
%bcond_without tests # build without tests
%define apxs %{_sbindir}/apxs1
+%include /usr/lib/rpm/macros.python
Summary: Package for testing adapter.awk
Summary(et): Pakk adapter.awk testimiseks
Name: adapter
@@ -38,6 +39,7 @@
Requires(postun): /usr/sbin/userdel
Requires: pam >= 0.77.3
Requires: daemontools >= 0.76-1.4
+BuildRequires: rpm-pythonprov
%{?with_home_etc:Requires: home-etc >= 1.0.8}
Conflicts: qmail-client
Provides: group(nofiles)
@@ -103,6 +105,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2005/03/05 11:30:31 glen
+- remove obsolete rpm-pythonprov / macros.python
+
Revision 1.12 2005/03/02 22:23:49 glen
- fixups for init.d scripts
================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.139 SPECS/adapter.awk:1.140
--- SPECS/adapter.awk:1.139 Thu Mar 3 10:42:10 2005
+++ SPECS/adapter.awk Sat Mar 5 12:30:31 2005
@@ -14,6 +14,8 @@
# TODO
# - parse ../PLD-doc/BuildRequires.txt and setup proper BR epoches?
# - add "-nc" option to skip CVS interaction
+# - sort Summary(XX)
+# - sort Requires, BuildRequires
BEGIN {
preamble = 1 # Is it part of preamble? Default - yes
@@ -92,6 +94,11 @@
date = 1
}
+# Obsolete
+/^%include.*\/usr\/lib\/rpm\/macros\.python$/ {
+ next
+}
+
################
# %description #
################
@@ -488,6 +495,13 @@
mandir = $3
if ($2 ~ /_infodir/)
infodir = $3
+ }
+
+ if (field ~ /buildrequires:/) {
+ # obsolete
+ if ($2 ~ /rpm-pythonprov/) {
+ next
+ }
}
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.139&r2=1.140&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
