SPECS: beryl-core.spec - cleanup, BR update

qboosh qboosh at pld-linux.org
Wed Oct 4 23:45:38 CEST 2006


Author: qboosh                       Date: Wed Oct  4 21:45:37 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup, BR update

---- Files affected:
SPECS:
   beryl-core.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/beryl-core.spec
diff -u SPECS/beryl-core.spec:1.1 SPECS/beryl-core.spec:1.2
--- SPECS/beryl-core.spec:1.1	Sun Oct  1 13:53:16 2006
+++ SPECS/beryl-core.spec	Wed Oct  4 23:45:32 2006
@@ -8,14 +8,16 @@
 Group:		X11
 Source0:	http://distfiles.xgl-coffee.org/beryl-core/%{name}-%{version}.tar.bz2
 # Source0-md5:	17fc446a78c557e02417b85ce7ea29e1
-Patch0:		beryl-core-aiglx.patch
+Patch0:		%{name}-aiglx.patch
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
-BuildRequires:	intltool
+BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	libpng-devel
 BuildRequires:	libtool
-BuildRequires:	startup-notification-devel
-BuildRequires:	xorg-lib-libXcomposite-devel
+BuildRequires:	pkgconfig
+BuildRequires:	startup-notification-devel >= 0.7
+BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xorg-lib-libXcomposite-devel >= 0.3
 BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-proto-glproto-devel
@@ -51,7 +53,7 @@
 Requires:	libpng-devel
 Requires:	startup-notification-devel >= 0.7
 Requires:	xorg-lib-libSM-devel
-Requires:	xorg-lib-libXcomposite-devel
+Requires:	xorg-lib-libXcomposite-devel >= 0.3
 Requires:	xorg-lib-libXdamage-devel
 Requires:	xorg-lib-libXrandr-devel
 Conflicts:	compiz-devel
@@ -68,11 +70,6 @@
 
 %build
 autoreconf -v --install
-ln -s ../po config/po
-#%{__intltoolize}
-%{__glib_gettextize} --copy --force
-rm config/po
-sed -i -e 's/^mkinstalldirs.*/MKINSTALLDIRS=mkdir -p/' po/Makefile.in.in
 
 %configure \
 	--disable-static
@@ -82,11 +79,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	desktopfilesdir=%{_datadir}/wm-properties \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -107,7 +101,10 @@
 %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  2006/10/04 21:45:32  qboosh
+- cleanup, BR update
+
 Revision 1.1  2006/10/01 11:53:16  wolf
 - based on rotom's work
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/beryl-core.spec?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list