SPECS: xorg-data-xbitmaps.spec, xorg-data-xcursor-themes.spec, xor...

qboosh qboosh at pld-linux.org
Sat Aug 27 20:00:42 CEST 2005 

Author: qboosh                       Date: Sat Aug 27 18:00:42 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups, BR s/pkg-config/pkgconfig >= 0.19/

---- Files affected:
SPECS:
   xorg-data-xbitmaps.spec (1.1 -> 1.2) , xorg-data-xcursor-themes.spec (1.1 -> 1.2) , xorg-data-xkbdata.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/xorg-data-xbitmaps.spec
diff -u SPECS/xorg-data-xbitmaps.spec:1.1 SPECS/xorg-data-xbitmaps.spec:1.2
--- SPECS/xorg-data-xbitmaps.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-data-xbitmaps.spec	Sat Aug 27 20:00:36 2005
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# $Rev: 3338 $, $Date$
-#
 Summary:	X bitmaps data
 Summary(pl):	Bitmapy dla X
 Name:		xorg-data-xbitmaps
@@ -13,9 +11,9 @@
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	pkgconfig >= 0.19
 BuildRequires:	xorg-util-util-macros
-BuildRequires:	pkg-config
-BuildRoot:	%{tmpdir}/xbitmaps-%{version}-root-%(id -u -n)
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
 
@@ -25,11 +23,9 @@
 %description -l pl
 Bitmapy dla X.
 
-
 %prep
 %setup -q -n xbitmaps-%{version}
 
-
 %build
 %{__aclocal}
 %{__autoconf}
@@ -39,7 +35,6 @@
 
 %{__make}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -47,23 +42,23 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir}
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(644,root,root,755)
 %{_includedir}/X11/bitmaps
 %{_pkgconfigdir}/xbitmaps.pc
 
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/27 18:00:36  qboosh
+- cleanups, BR s/pkg-config/pkgconfig >= 0.19/
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-data-xcursor-themes.spec
diff -u SPECS/xorg-data-xcursor-themes.spec:1.1 SPECS/xorg-data-xcursor-themes.spec:1.2
--- SPECS/xorg-data-xcursor-themes.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-data-xcursor-themes.spec	Sat Aug 27 20:00:36 2005
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# $Rev: 3431 $, $Date$
-#
 Summary:	Cursor themes
 Summary(pl):	Motywy kursorów
 Name:		xorg-data-xcursor-themes
@@ -13,10 +11,10 @@
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	xorg-util-util-macros
-BuildRequires:	pkg-config
+BuildRequires:	pkgconfig >= 0.19
 BuildRequires:	xorg-app-xcursorgen
-BuildRoot:	%{tmpdir}/xcursor-themes-%{version}-root-%(id -u -n)
+BuildRequires:	xorg-util-util-macros
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Cursor themes.
@@ -24,7 +22,6 @@
 %description -l pl
 Motywy kursorów.
 
-
 %package -n xcursor-theme-handhelds
 Summary:	Cursors Theme "handhelds"
 Summary(pl):	Motyw kursorów "handhelds"
@@ -36,7 +33,6 @@
 %description -n xcursor-theme-handhelds -l pl
 Motyw kursorów "handhelds" dla X11.
 
-
 %package -n xcursor-theme-redglass
 Summary:	Cursors theme "redglass"
 Summary(pl):	Motyw kursorów "redglass"
@@ -48,7 +44,6 @@
 %description -n xcursor-theme-redglass -l pl
 Motyw kursorów "redglass" dla X11.
 
-
 %package -n xcursor-theme-whiteglass
 Summary:	Cursors theme "whiteglass"
 Summary(pl):	Motyw kursorów "whiteglass"
@@ -60,11 +55,9 @@
 %description -n xcursor-theme-whiteglass -l pl
 Motyw kursorów "whiteglass" dla X11.
 
-
 %prep
 %setup -q -n xcursor-themes-%{version}
 
-
 %build
 %{__aclocal}
 %{__autoconf}
@@ -74,18 +67,15 @@
 
 %{__make}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files -n xcursor-theme-handhelds
 %defattr(644,root,root,755)
 %{_iconsdir}/handhelds
@@ -98,13 +88,15 @@
 %defattr(644,root,root,755)
 %{_iconsdir}/whiteglass
 
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/27 18:00:36  qboosh
+- cleanups, BR s/pkg-config/pkgconfig >= 0.19/
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-data-xkbdata.spec
diff -u SPECS/xorg-data-xkbdata.spec:1.1 SPECS/xorg-data-xkbdata.spec:1.2
--- SPECS/xorg-data-xkbdata.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-data-xkbdata.spec	Sat Aug 27 20:00:37 2005
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# $Rev: 3432 $, $Date$
-#
 Summary:	XKB data
 Summary(pl):	Dane dla XKB
 Name:		xorg-data-xkbdata
@@ -13,10 +11,10 @@
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	xorg-util-util-macros
-BuildRequires:	pkg-config
+BuildRequires:	pkgconfig >= 0.19
 BuildRequires:	xorg-app-xkbcomp
-BuildRoot:	%{tmpdir}/xkbdata-%{version}-root-%(id -u -n)
+BuildRequires:	xorg-util-util-macros
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
 
@@ -26,11 +24,9 @@
 %description -l pl
 Dane dla XKB.
 
-
 %prep
 %setup -q -n xkbdata-%{version}
 
-
 %build
 %{__aclocal}
 %{__autoconf}
@@ -40,29 +36,28 @@
 
 %{__make}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(644,root,root,755)
 %{_libdir}/X11/xkb
 
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/27 18:00:37  qboosh
+- cleanups, BR s/pkg-config/pkgconfig >= 0.19/
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-data-xbitmaps.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-data-xcursor-themes.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-data-xkbdata.spec?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list