Author: wolf Date: Sun Dec 3 17:45:27 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - 20061201
---- Files affected: SPECS: beryl-core.spec (1.11 -> 1.12) , beryl-plugins.spec (1.5 -> 1.6) , beryl-settings.spec (1.6 -> 1.7) , emerald.spec (1.6 -> 1.7) , emerald-themes.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/beryl-core.spec diff -u SPECS/beryl-core.spec:1.11 SPECS/beryl-core.spec:1.12 --- SPECS/beryl-core.spec:1.11 Sat Nov 25 18:17:24 2006 +++ SPECS/beryl-core.spec Sun Dec 3 18:45:21 2006 @@ -5,17 +5,20 @@ Summary: OpenGL window and compositing manager Summary(pl): OpenGL-owy zarządca okien i składania Name: beryl-core -Version: 20061102 +Version: 20061201 Release: 1 License: MIT Group: X11 #Source0: http://distfiles.xgl-coffee.org/beryl-core/%{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2 -# Source0-md5: 52dc5f8e5c65d7fb60766f7877c13c1c +# Source0-md5: 5c0ac3fcc25e8e3936e854dcff5d1b05 +Source1: beryl-mesa-%{version}.tar.bz2 +# Source1-md5: c9a58134b47f871daefe815d9c7b5692 Patch0: %{name}-aiglx.patch BuildRequires: autoconf >= 2.57 BuildRequires: automake BuildRequires: glib2-devel >= 2.0 +BuildRequires: intltool BuildRequires: libpng-devel BuildRequires: libtool BuildRequires: pkgconfig @@ -73,14 +76,20 @@ Pliki nagłówkowe dla beryla. %prep -%setup -q -n %{name} +%setup -q -a1 -n %{name} %patch0 -p1 %build autoreconf -v --install +%{__glib_gettextize} +intltoolize --automake --copy --force + +# bashizms inside +sed -i -e '[EMAIL PROTECTED] /bin/[EMAIL PROTECTED]/bin/bash@' configure %configure \ - --disable-static + --disable-static \ + --with-berylmesadir=beryl-mesa %{__make} %install @@ -89,17 +98,23 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog README TODO %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/*.so.*.*.* +%dir %{_libdir}/beryl +%dir %{_libdir}/beryl/backends +%attr(755,root,root) %{_libdir}/beryl/backends/*.so +%{_libdir}/beryl/backends/*.la %{_datadir}/beryl %{_mandir}/man1/* @@ -117,6 +132,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12 2006/12/03 17:45:21 wolf +- 20061201 + Revision 1.11 2006/11/25 17:17:24 adamg - BuildRequires: python-modules, xorg-lib-libXinerama-devel ================================================================ Index: SPECS/beryl-plugins.spec diff -u SPECS/beryl-plugins.spec:1.5 SPECS/beryl-plugins.spec:1.6 --- SPECS/beryl-plugins.spec:1.5 Thu Nov 2 15:35:38 2006 +++ SPECS/beryl-plugins.spec Sun Dec 3 18:45:21 2006 @@ -2,13 +2,13 @@ Summary: beryl plugins Summary(pl): Wtyczki do beryla Name: beryl-plugins -Version: 20061102 +Version: 20061201 Release: 1 License: GPL/MIT Group: X11 #Source0: http://distfiles.xgl-coffee.org/beryl-plugins/%{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2 -# Source0-md5: 9782e45a25f5781a1553c7be879106c2 +# Source0-md5: 564c90cecfe658f356a4c07a11893bd1 Patch0: %{name}-fsck-patents.patch BuildRequires: autoconf >= 2.57 BuildRequires: automake @@ -16,6 +16,7 @@ BuildRequires: cairo-devel >= 1.0 BuildRequires: dbus-devel >= 0.50 BuildRequires: glib2-devel >= 2.0 +BuildRequires: intltool BuildRequires: librsvg-devel >= 2.14.0 BuildRequires: libtool BuildRequires: pkgconfig @@ -34,6 +35,8 @@ %build autoreconf -v --install +%{__glib_gettextize} +intltoolize --automake --copy --force %configure \ --disable-static @@ -47,10 +50,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/beryl/*.la +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS README %dir %{_libdir}/beryl @@ -64,6 +69,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2006/12/03 17:45:21 wolf +- 20061201 + Revision 1.5 2006/11/02 14:35:38 wolf - 20061102 ================================================================ Index: SPECS/beryl-settings.spec diff -u SPECS/beryl-settings.spec:1.6 SPECS/beryl-settings.spec:1.7 --- SPECS/beryl-settings.spec:1.6 Thu Nov 2 15:35:38 2006 +++ SPECS/beryl-settings.spec Sun Dec 3 18:45:21 2006 @@ -2,13 +2,13 @@ Summary: A GTK+ tool to configure beryl Summary(pl): Narzędzie GTK+ do konfiguracji beryla Name: beryl-settings -Version: 20061102 +Version: 20061201 Release: 1 License: GPL v2+ Group: X11/Window Managers/Tools #Source0: http://distfiles.xgl-coffee.org/beryl-settings/%{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2 -# Source0-md5: 94aa507ed6bc82cd918da0e325536489 +# Source0-md5: 86bcfbcc048fd6a0f5abfa3c7ce72f32 BuildRequires: autoconf >= 2.57 BuildRequires: automake BuildRequires: beryl-core-devel @@ -51,7 +51,6 @@ %attr(755,root,root) %{_bindir}/beryl-settings %{_desktopdir}/beryl-settings.desktop %{_pixmapsdir}/*.svg -%{_datadir}/beryl/hints %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -59,6 +58,9 @@ * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2006/12/03 17:45:21 wolf +- 20061201 + Revision 1.6 2006/11/02 14:35:38 wolf - 20061102 ================================================================ Index: SPECS/emerald.spec diff -u SPECS/emerald.spec:1.6 SPECS/emerald.spec:1.7 --- SPECS/emerald.spec:1.6 Thu Nov 2 15:35:38 2006 +++ SPECS/emerald.spec Sun Dec 3 18:45:21 2006 @@ -2,13 +2,13 @@ Summary: A GTK+ tool to configure window decorations in beryl Summary(pl): Narzędzie GTK+ do konfiguracji dekoracji okien w berylu Name: emerald -Version: 20061102 +Version: 20061201 Release: 1 License: GPL/MIT Group: X11 #Source0: http://distfiles.xgl-coffee.org/emerald/%{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2 -# Source0-md5: 6d6aefdcdf71760820f3d80dcd9e5945 +# Source0-md5: e0ec3812a8d1a284ff8ac2ea94b56fdc BuildRequires: autoconf >= 2.57 BuildRequires: automake BuildRequires: beryl-core-devel @@ -118,6 +118,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2006/12/03 17:45:21 wolf +- 20061201 + Revision 1.6 2006/11/02 14:35:38 wolf - 20061102 ================================================================ Index: SPECS/emerald-themes.spec diff -u SPECS/emerald-themes.spec:1.5 SPECS/emerald-themes.spec:1.6 --- SPECS/emerald-themes.spec:1.5 Thu Nov 2 15:35:38 2006 +++ SPECS/emerald-themes.spec Sun Dec 3 18:45:21 2006 @@ -2,13 +2,13 @@ Summary: Themes for emerald Summary(pl): Motywy do emerald Name: emerald-themes -Version: 20061102 +Version: 20061201 Release: 1 License: GPL/MIT Group: X11 #Source0: http://distfiles.xgl-coffee.org/emerald-themes/%{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2 -# Source0-md5: 9143cad6e4396e73ca5e8ffd5cbfc6bb +# Source0-md5: b5e8fe08bd091f324ae8e2e911a7b29a BuildRequires: autoconf >= 2.57 BuildRequires: automake Requires: emerald @@ -49,6 +49,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2006/12/03 17:45:21 wolf +- 20061201 + Revision 1.5 2006/11/02 14:35:38 wolf - 20061102 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/beryl-core.spec?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/SPECS/beryl-plugins.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/beryl-settings.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/emerald.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/emerald-themes.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
