Author: glen                         Date: Sun Sep  3 22:34:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use _gtkdocdir from rpm macros

---- Files affected:
SPECS:
   gnome-core.spec (1.159 -> 1.160) , gnome-libs.spec (1.184 -> 1.185) , 
linphone-im.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/gnome-core.spec
diff -u SPECS/gnome-core.spec:1.159 SPECS/gnome-core.spec:1.160
--- SPECS/gnome-core.spec:1.159 Sat Sep  2 22:51:33 2006
+++ SPECS/gnome-core.spec       Mon Sep  4 00:34:39 2006
@@ -54,6 +54,7 @@
 BuildRequires: libpng >= 1.0.8
 BuildRequires: libtool
 BuildRequires: libxml-devel
+BuildRequires: rpmbuild(macros) >= 1.98
 BuildRequires: scrollkeeper
 BuildRequires: zlib-devel
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
@@ -63,7 +64,6 @@
 
 %define                _sysconfdir     /etc/X11/GNOME
 %define                _omf_dest_dir   %(scrollkeeper-config --omfdir)
-%define                _gtkdocdir      %{_docdir}/gtk-doc/html
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -287,6 +287,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.160  2006/09/03 22:34:39  glen
+- use _gtkdocdir from rpm macros
+
 Revision 1.159  2006/09/02 20:51:33  glen
 - _defaultdocdir -> _docdir
 

================================================================
Index: SPECS/gnome-libs.spec
diff -u SPECS/gnome-libs.spec:1.184 SPECS/gnome-libs.spec:1.185
--- SPECS/gnome-libs.spec:1.184 Sat Sep  2 22:51:33 2006
+++ SPECS/gnome-libs.spec       Mon Sep  4 00:34:39 2006
@@ -48,6 +48,7 @@
 BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: libtiff-devel
 BuildRequires: libtool
+BuildRequires: rpmbuild(macros) >= 1.98
 BuildRequires: xorg-lib-libSM-devel
 BuildRequires: zlib-devel
 Requires:      ORBit >= 1:0.5.17-7
@@ -56,7 +57,6 @@
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/X11/GNOME
-%define                _gtkdocdir      %{_docdir}/gtk-doc/html
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -426,6 +426,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.185  2006/09/03 22:34:39  glen
+- use _gtkdocdir from rpm macros
+
 Revision 1.184  2006/09/02 20:51:33  glen
 - _defaultdocdir -> _docdir
 

================================================================
Index: SPECS/linphone-im.spec
diff -u SPECS/linphone-im.spec:1.8 SPECS/linphone-im.spec:1.9
--- SPECS/linphone-im.spec:1.8  Sat Sep  2 22:51:33 2006
+++ SPECS/linphone-im.spec      Mon Sep  4 00:34:39 2006
@@ -16,12 +16,11 @@
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: rpmbuild(macros) >= 1.98
 Requires(post,postun): /sbin/ldconfig
 #Requires(post,postun):        /usr/bin/scrollkeeper-update
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _gtkdocdir      %{_docdir}/gtk-doc/html
-
 %description
 Linphone is a web phone: it let you phone to your friends anywhere in
 the whole world, freely, simply by using the internet. The cost of the
@@ -110,7 +109,7 @@
 
 find $RPM_BUILD_ROOT -name '*.a'|xargs rm
 
-#%find_lang %{name} 
+#%find_lang %{name}
 #--with-gnome --all-name
 
 %clean
@@ -152,6 +151,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/09/03 22:34:39  glen
+- use _gtkdocdir from rpm macros
+
 Revision 1.8  2006/09/02 20:51:33  glen
 - _defaultdocdir -> _docdir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-core.spec?r1=1.159&r2=1.160&f=u
    http://cvs.pld-linux.org/SPECS/gnome-libs.spec?r1=1.184&r2=1.185&f=u
    http://cvs.pld-linux.org/SPECS/linphone-im.spec?r1=1.8&r2=1.9&f=u

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

Reply via email to