Author: qboosh Date: Fri Jan 6 18:16:17 2012 GMT Module: packages Tag: HEAD ---- Log message: - moved X-related man pages to -X11 - disable static library by default (building it causes all modules to be built into main library (both static and shared) and thus main library linked with all X11 stuff; added static_modules bcond to switch it - release 4
---- Files affected: packages/libgii: libgii.spec (1.58 -> 1.59) ---- Diffs: ================================================================ Index: packages/libgii/libgii.spec diff -u packages/libgii/libgii.spec:1.58 packages/libgii/libgii.spec:1.59 --- packages/libgii/libgii.spec:1.58 Thu Apr 7 09:22:58 2011 +++ packages/libgii/libgii.spec Fri Jan 6 19:16:12 2012 @@ -1,22 +1,24 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_with pthreads # with pthreads support +%bcond_with pthreads # with pthreads support +%bcond_with static_modules # build static library AND make all modules builtin (also in shared lib) # Summary: General Input Interface library fo LibGGI Summary(pl.UTF-8): Biblioteka do obsługi urządzeń wejściowych dla GGI Name: libgii Version: 1.0.2 -Release: 3 +Release: 4 License: BSD-like Group: Libraries Source0: http://www.ggi-project.org/ftp/ggi/v2.2/%{name}-%{version}.src.tar.bz2 # Source0-md5: e002b3b3b7fae2b2558fe7ac854359b7 URL: http://www.ggi-project.org/ BuildRequires: autoconf >= 2.59-9 -BuildRequires: automake -BuildRequires: libtool >= 1:1.4.2-9 +BuildRequires: automake >= 1.4 +BuildRequires: libtool >= 2:2.0 BuildRequires: xorg-lib-libX11-devel +BuildRequires: xorg-lib-libXxf86dga-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -72,7 +74,7 @@ %prep %setup -q -rm acinclude.m4 m4/lt*.m4 +%{__rm} acinclude.m4 m4/lt*.m4 %build %{__libtoolize} @@ -81,6 +83,7 @@ %{__autoconf} %{__automake} %configure \ + %{!?with_static_modules:--disable-static} \ %{?with_pthreads:--enable-mutexes=pthread} \ %{!?debug:--disable-debug} @@ -96,6 +99,8 @@ install demos/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} %{__rm} $RPM_BUILD_ROOT%{_libdir}/ggi/{filter,input}/*.la +# inputs not supported on Linux +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man7/input-{directx,quartz}.7 %clean rm -rf $RPM_BUILD_ROOT @@ -105,16 +110,16 @@ %files %defattr(644,root,root,755) -%doc FAQ NEWS README doc/README.directx +%doc FAQ NEWS README %dir %{_sysconfdir}/ggi %dir %{_sysconfdir}/ggi/filter %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ggi/libgii.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ggi/filter/keytrans %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ggi/filter/mouse %attr(755,root,root) %{_bindir}/mhub -%attr(755,root,root) %{_libdir}/libgg.so.*.* -%attr(755,root,root) %{_libdir}/libgii.so.*.* +%attr(755,root,root) %{_libdir}/libgg.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgg.so.1 +%attr(755,root,root) %{_libdir}/libgii.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgii.so.1 %dir %{_libdir}/ggi %dir %{_libdir}/ggi/filter @@ -135,14 +140,28 @@ %attr(755,root,root) %{_libdir}/ggi/input/stdin.so %attr(755,root,root) %{_libdir}/ggi/input/tcp.so %{_mandir}/man1/mhub.1* -%{_mandir}/man1/xsendbut.1* %{_mandir}/man5/libgii.conf.5* -%{_mandir}/man7/* +%{_mandir}/man7/filter-key.7* +%{_mandir}/man7/filter-keytrans* +%{_mandir}/man7/filter-mouse.7* +%{_mandir}/man7/filter-save.7* +%{_mandir}/man7/filter-tcp.7* +%{_mandir}/man7/input-file.7* +%{_mandir}/man7/input-linux-evdev.7* +%{_mandir}/man7/input-linux-kbd.7* +%{_mandir}/man7/input-linux-mouse.7* +%{_mandir}/man7/input-lk201.7* +%{_mandir}/man7/input-mouse.7* +%{_mandir}/man7/input-tcp.7* +%{_mandir}/man7/libgg.7* +%{_mandir}/man7/libgii.7* %files X11 %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/xsendbut %attr(755,root,root) %{_libdir}/ggi/input/x.so +%{_mandir}/man1/xsendbut.1* +%{_mandir}/man7/input-x.7* %files devel %defattr(644,root,root,755) @@ -152,13 +171,17 @@ %{_libdir}/libgg.la %{_libdir}/libgii.la %{_includedir}/ggi -%{_mandir}/man3/* +%{_mandir}/man3/GG_*.3* +%{_mandir}/man3/gg*.3* +%{_mandir}/man3/gii*.3* %{_examplesdir}/%{name}-%{version} +%if %{with static_modules} %files static %defattr(644,root,root,755) %{_libdir}/libgg.a %{_libdir}/libgii.a +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -166,6 +189,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.59 2012/01/06 18:16:12 qboosh +- moved X-related man pages to -X11 +- disable static library by default (building it causes all modules to be built into main + library (both static and shared) and thus main library linked with all X11 stuff; + added static_modules bcond to switch it +- release 4 + Revision 1.58 2011/04/07 07:22:58 lisu - restore libtool files, there is now *.pc files - rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libgii/libgii.spec?r1=1.58&r2=1.59&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
