SPECS: beryl-core.spec - epoch 1 - removed duplicate files

[qboosh]

Author: qboosh                       Date: Sun Dec 10 12:04:22 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- epoch 1
- removed duplicate files

---- Files affected:
SPECS:
   beryl-core.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/beryl-core.spec
diff -u SPECS/beryl-core.spec:1.14 SPECS/beryl-core.spec:1.15
--- SPECS/beryl-core.spec:1.14	Sun Dec 10 11:06:41 2006
+++ SPECS/beryl-core.spec	Sun Dec 10 13:04:17 2006
@@ -2,18 +2,20 @@
 #
 # TODO: python
 #
-%bcond_with     beryl_mesa
-
+# Conditional build:
+%bcond_with	beryl_mesa
+#
 Summary:	OpenGL window and compositing manager
 Summary(pl):	OpenGL-owy zarządca okien i składania
 Name:		beryl-core
 Version:	0.1.3
 Release:	1
+Epoch:		1
 License:	MIT
 Group:		X11
-Source0:	http://releases.beryl-project.org/0.1.3/%{name}-%{version}.tar.bz2
+Source0:	http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5:	24caed8a8cb50fd30823a9ee182f85f4
-Source1:	http://releases.beryl-project.org/0.1.3/beryl-mesa-%{version}.tar.bz2
+Source1:	http://releases.beryl-project.org/%{version}/beryl-mesa-%{version}.tar.bz2
 # Source1-md5:	c22765c2637846907ee6154b548151e9
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -59,7 +61,7 @@
 Summary:	Header files for beryl
 Summary(pl):	Pliki nagłówkowe dla beryla
 Group:		Development
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	OpenGL-devel
 Requires:	libpng-devel
 Requires:	startup-notification-devel >= 0.7
@@ -108,9 +110,9 @@
 sed -i 's/bin_PROGRAMS = beryl beryl-settings-dump beryl-xgl/bin_PROGRAMS = beryl beryl-settings-dump/' src/Makefile.am
 autoreconf -v --install
 %{__glib_gettextize}
-intltoolize --automake --copy --force
+%{__intltoolize} --automake
 
-# bashizms inside
+# bashisms inside
 sed -i -e 's@^#! /bin/sh$@#!/bin/bash@' configure
 
 %configure \
@@ -140,17 +142,15 @@
 %dir %{_libdir}/beryl
 %dir %{_libdir}/beryl/backends
 %attr(755,root,root) %{_libdir}/beryl/backends/*.so
+# XXX: check if needed (I don't see libltdl in BRs)
 %{_libdir}/beryl/backends/*.la
 %{_datadir}/beryl
 %{_mandir}/man1/*
-%{_libdir}/beryl/backends
-%{_libdir}/beryl/backends/*.so
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/*.so
+%attr(755,root,root) %{_libdir}/*.so
 %{_libdir}/*.la
-%{_libdir}/beryl/backends/*.la
 %{_includedir}/beryl
 %{_pkgconfigdir}/*.pc
 %{_mandir}/man3/*.3*
@@ -161,6 +161,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/12/10 12:04:17  qboosh
+- epoch 1
+- removed duplicate files
+
 Revision 1.14  2006/12/10 10:06:41  adamg
 - do not bcond sources
 
================================================================

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