Author: qboosh Date: Fri Jan 13 15:11:18 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - BuildConflicts after BuildRequires
---- Files affected: SPECS: adapter.awk (1.267 -> 1.268) , qt4.spec (1.48 -> 1.49) ---- Diffs: ================================================================ Index: SPECS/adapter.awk diff -u SPECS/adapter.awk:1.267 SPECS/adapter.awk:1.268 --- SPECS/adapter.awk:1.267 Wed Jan 4 15:06:10 2006 +++ SPECS/adapter.awk Fri Jan 13 16:11:13 2006 @@ -120,6 +120,8 @@ gsub(/^Group/, "6Group", s); gsub(/^URL/, "7URL", s); + gsub(/^BuildRequires/, "B1BuildRequires", s); + gsub(/^BuildConflicts/, "B2BuildConflicts", s); gsub(/^Provides/, "X1Provides", s); gsub(/^Obsoletes/, "X2Obsoletes", s); gsub(/^Conflicts/, "X3Conflicts", s); ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.48 SPECS/qt4.spec:1.49 --- SPECS/qt4.spec:1.48 Thu Jan 12 23:07:41 2006 +++ SPECS/qt4.spec Fri Jan 13 16:11:13 2006 @@ -55,7 +55,6 @@ Patch10: %{name}-support-cflags-with-commas.patch URL: http://www.trolltech.com/products/qt/ Icon: qt.xpm -BuildConflicts: QtCore %{?with_ibase:BuildRequires: Firebird-devel} BuildRequires: OpenGL-devel %{?with_sqlite3:BuildRequires: sqlite3-devel} @@ -84,6 +83,7 @@ BuildRequires: xft-devel BuildRequires: xrender-devel BuildRequires: zlib-devel +BuildConflicts: QtCore Requires: OpenGL Obsoletes: qt-extensions Obsoletes: qt-utils @@ -1304,6 +1304,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.49 2006/01/13 15:11:13 qboosh +- BuildConflicts after BuildRequires + Revision 1.48 2006/01/12 22:07:41 glen - adapterized ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.267&r2=1.268&f=u http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.48&r2=1.49&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit