packages: libggiwmh/libggiwmh.spec - updated to 0.3.2 - added static_module...

qboosh qboosh at pld-linux.org
Sun Jan 15 19:01:44 CET 2012


Author: qboosh                       Date: Sun Jan 15 18:01:44 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.3.2
- added static_modules bcond (libggi-like)

---- Files affected:
packages/libggiwmh:
   libggiwmh.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/libggiwmh/libggiwmh.spec
diff -u packages/libggiwmh/libggiwmh.spec:1.5 packages/libggiwmh/libggiwmh.spec:1.6
--- packages/libggiwmh/libggiwmh.spec:1.5	Tue Feb 13 07:46:51 2007
+++ packages/libggiwmh/libggiwmh.spec	Sun Jan 15 19:01:39 2012
@@ -1,16 +1,24 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	static_modules	# build static library AND make all modules builtin (also in shared lib)
+#
 Summary:	LibGGIWMH - Window Manager Hint extension
 Summary(pl.UTF-8):	LibGGIWMH - rozszerzenie podpowiedzi dla zarządców okien
 Name:		libggiwmh
-Version:	0.2.2
+Version:	0.3.2
 Release:	1
 License:	Public Domain
 Group:		Libraries
-Source0:	http://www.ggi-project.org/ftp/ggi/v2.1/%{name}-%{version}.src.tar.bz2
-# Source0-md5:	42f51c7496508f17d524ea1f9b10a0e0
+# HTTP 403
+#Source0:	http://www.ggi-project.org/ftp/ggi/v2.2/%{name}-%{version}.src.tar.bz2
+Source0:	http://downloads.sourceforge.net/ggi/%{name}-%{version}.src.tar.bz2
+# Source0-md5:	5f47aad2a8e224a09e90f3f0073c3c11
 URL:		http://www.ggi-project.org/packages/libggiwmh.html
-BuildRequires:	XFree86-devel
-BuildRequires:	libggi-devel >= 2.1.2
+BuildRequires:	libggi-devel >= 2.2.2
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel
+Requires:	libggi >= 2.2.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,7 +35,11 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libggiwmh
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libggi-devel >= 2.1.2
+Requires:	libggi-devel >= 2.2.2
+%if %{with static_modules}
+Requires:	xorg-lib-libX11-devel
+Requires:	xorg-lib-libXext-devel
+%endif
 
 %description devel
 Header files for libggiwmh library.
@@ -35,6 +47,18 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki libggiwmh.
 
+%package static
+Summary:	Static libggiwmh library
+Summary(pl.UTF-8):	Statyczna biblioteka libggiwmh
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static libggiwmh library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libggiwmh.
+
 %package X
 Summary:	X target for libggiwmh library
 Summary(pl.UTF-8):	Wtyczka X dla biblioteki libggiwmh
@@ -51,7 +75,8 @@
 %setup -q
 
 %build
-%configure
+%configure \
+	%{!?with_static_modules:--disable-static}
 %{__make}
 
 %install
@@ -60,7 +85,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/ggi/wmh/display/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ggi/wmh/display/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,6 +97,7 @@
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog README
 %attr(755,root,root) %{_libdir}/libggiwmh.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libggiwmh.so.0
 %dir %{_libdir}/ggi/wmh
 %dir %{_libdir}/ggi/wmh/display
 %attr(755,root,root) %{_libdir}/ggi/wmh/display/pseudo_stubs_wmh.so
@@ -87,6 +113,12 @@
 %{_includedir}/ggi/internal/wmh.h
 %{_mandir}/man3/ggiWmh*.3*
 
+%if %{with static_modules}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libggiwmh.a
+%endif
+
 %files X
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ggi/wmh/display/X_wmh.so
@@ -97,6 +129,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2012/01/15 18:01:39  qboosh
+- updated to 0.3.2
+- added static_modules bcond (libggi-like)
+
 Revision 1.5  2007/02/13 06:46:51  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libggiwmh/libggiwmh.spec?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list