Author: wiget Date: Sat Feb 12 15:50:36 2011 GMT Module: packages Tag: HEAD ---- Log message: - enable gt - kill libtool files - rel.3
---- Files affected: packages/libcanberra: libcanberra.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: packages/libcanberra/libcanberra.spec diff -u packages/libcanberra/libcanberra.spec:1.25 packages/libcanberra/libcanberra.spec:1.26 --- packages/libcanberra/libcanberra.spec:1.25 Sat Nov 6 11:38:17 2010 +++ packages/libcanberra/libcanberra.spec Sat Feb 12 16:50:31 2011 @@ -1,13 +1,13 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_with gtk3 # gtk+3 support +%bcond_without gtk3 # gtk+3 support # Summary: libcanberra - the portable sound event library Summary(pl.UTF-8): libcanberra - przenośna biblioteka zdarzeń dźwiękowych Name: libcanberra Version: 0.26 -Release: 2 +Release: 3 License: LGPL v2+ Group: Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/%{name}-%{version}.tar.gz @@ -28,7 +28,7 @@ BuildRequires: pulseaudio-devel >= 0.9.11-1 BuildRequires: rpmbuild(macros) >= 1.527 %if %{with gtk3} -BuildRequires: gtk+3-devel +BuildRequires: gtk+3-devel >= 3.0.0 %endif Requires: pulseaudio-libs >= 0.9.11-1 Requires: sound-theme-freedesktop @@ -88,6 +88,7 @@ Group: X11/Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-gtk = %{version}-%{release} +Requires: %{name}-gtk-devel-common = %{version}-%{release} Requires: gtk+2-devel >= 2:2.20.0 %description gtk-devel @@ -108,6 +109,17 @@ %description gtk-static -l pl.UTF-8 Statyczna biblioteka libcanberra-gtk. +%package gtk-devel-common +Summary: Header files for libcanberra-gtk library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libcanberra-gtk +Group: X11/Development/Libraries + +%description gtk-devel-common +Header files for libcanberra-gtk library. + +%description gtk-devel-common -l pl.UTF-8 +Pliki nagłówkowe biblioteki libcanberra-gtk. + %package gtk3 Summary: GTK+ 3.x bindings for libcanberra library Summary(pl.UTF-8): Wiązania GTK+ 3.x do biblioteki libcanberra @@ -126,6 +138,7 @@ Group: X11/Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-gtk3 = %{version}-%{release} +Requires: %{name}-gtk-devel-common = %{version}-%{release} Requires: gtk+3-devel %description gtk3-devel @@ -201,11 +214,12 @@ %{__make} -j1 install \ DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{a,la} -rm $RPM_BUILD_ROOT%{backenddir}/*.{a,la} -rm $RPM_BUILD_ROOT%{_datadir}/doc/libcanberra/README +%{__rm} $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{a,la} +%{__rm} $RPM_BUILD_ROOT%{backenddir}/*.{a,la} +%{__rm} $RPM_BUILD_ROOT%{_datadir}/doc/libcanberra/README +%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la %if %{with gtk3} -rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules/*.{a,la} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules/*.{a,la} %endif %clean @@ -242,7 +256,6 @@ %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libcanberra.so -%{_libdir}/libcanberra.la %{_includedir}/canberra.h %{_pkgconfigdir}/libcanberra.pc %{_datadir}/vala/vapi/libcanberra.vapi @@ -263,15 +276,17 @@ %files gtk-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libcanberra-gtk.so -%{_libdir}/libcanberra-gtk.la -%{_includedir}/canberra-gtk.h %{_pkgconfigdir}/libcanberra-gtk.pc -%{_datadir}/vala/vapi/libcanberra-gtk.vapi %files gtk-static %defattr(644,root,root,755) %{_libdir}/libcanberra-gtk.a +%files gtk-devel-common +%defattr(644,root,root,755) +%{_includedir}/canberra-gtk.h +%{_datadir}/vala/vapi/libcanberra-gtk.vapi + %if %{with gtk3} %files gtk3 %defattr(644,root,root,755) @@ -284,7 +299,6 @@ %files gtk3-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libcanberra-gtk3.so -%{_libdir}/libcanberra-gtk3.la %{_pkgconfigdir}/libcanberra-gtk3.pc %files gtk3-static @@ -309,6 +323,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.26 2011/02/12 15:50:31 wiget +- enable gt +- kill libtool files +- rel.3 + Revision 1.25 2010/11/06 10:38:17 wiget - gtk+3 support (disabled by default) - rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libcanberra/libcanberra.spec?r1=1.25&r2=1.26&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
