X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fribidi.spec;h=a40ab8e128af90f3d7d2efb7e474a14548aa3a25;hb=cefc387f35ec99bada3f6921c5489eb8b72044b3;hp=3161ce8ed49911465ff1d5843fcd8a1304c7f449;hpb=1c6aaa745d78399c95650504e50cdc3d2ab856c0;p=packages%2Ffribidi.git

diff --git a/fribidi.spec b/fribidi.spec
index 3161ce8..a40ab8e 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,72 +1,84 @@
-%define	snap	20011029
-Summary:	Library implementing the Unicode BiDi algorithm
-Summary(pl):	Biblioteka implementuj±ca algorytm Unicode BiDi
+#
+# Conditional build:
+%bcond_without	glib		# Glib usage
+%bcond_without	static_libs	# static library
+#
+Summary:	GNU FriBidi - library implementing the Unicode BiDi algorithm
+Summary(pl.UTF-8):	GNU FriBidi - biblioteka implementująca algorytm Unicode BiDi
 Name:		fribidi
-Version:	0.10.4
+Version:	0.19.6
 Release:	1
-License:	LGPL
+License:	LGPL v2.1+
 Group:		Libraries
-Source0:	ftp://ftp.sourceforge.net/pub/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-URL:		http://fribi.sf.net/
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	libtool
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Source0:	http://fribidi.org/download/%{name}-%{version}.tar.bz2
+# Source0-md5:	ce93d862344991173dabb609bf93ca1d
+Patch0:		format-security.patch
+URL:		http://fribidi.freedesktop.org/
+BuildRequires:	autoconf >= 2.64
+BuildRequires:	automake >= 1:1.11.1
+%{?with_glib:BuildRequires:	glib2-devel >= 1:2.4}
+BuildRequires:	libtool >= 2:2.2
+BuildRequires:	pkgconfig
+%{?with_glib:Requires:	glib2 >= 1:2.4}
 Obsoletes:	libfribidi0
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-A Free Implementation of the Unicode BiDi algorithm.
+GNU FriBidi is a free Implementation of the Unicode BiDi algorithm.
 
-%description -l pl
-Implementacja algorytmu Unicode BiDi.
+%description -l pl.UTF-8
+GNU FriBidi to wolnodostępna implementacja algorytmu Unicode BiDi.
 
 %package devel
-Summary:	Library implementing the Unicode BiDi algorithm
-Summary(pl):	Implementacja algorytmu Unicode BiDi
+Summary:	Header files for FriBidi library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki FriBidi
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
+%{?with_glib:Requires:	glib2-devel >= 1:2.4}
 Obsoletes:	libfribidi0-devel
 
 %description devel
 The fribidi-devel package includes header files for the fribidi
 package.
 
-Install fribidi-devel if you want to develop programs which will use
-fribidi.
-
-%description devel -l pl
-Pliki developerskie pozwalaj±ce na wykorzystywanie biblioteki fribidi
-w swoim oprogramowaniu.
+%description devel -l pl.UTF-8
+Pliki programistyczne pozwalające na wykorzystywanie biblioteki
+fribidi w swoim oprogramowaniu.
 
 %package static
-Summary:	Static %{name} libraries
-Summary(pl):	Biblioteki statyczne %{name}
+Summary:	Static FriBidi library
+Summary(pl.UTF-8):	Biblioteka statyczna FriBidi
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
-Static %{name} libraries.
+Static FriBidi library.
 
-%description static -l pl
-Biblioteki statyczne %{name}.
+%description static -l pl.UTF-8
+Biblioteka statyczna FriBidi.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-rm -f missing acinclude.m4
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	--disable-silent-rules \
+	%{?with_static_libs:--enable-static} \
+	--with-glib%{!?with_glib:=no}
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,15 +91,18 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README THANKS TODO
 %attr(755,root,root) %{_bindir}/fribidi
 %attr(755,root,root) %{_libdir}/libfribidi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfribidi.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/fribidi-config
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libfribidi.so
+%{_libdir}/libfribidi.la
 %{_includedir}/fribidi
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/fribidi.pc
+%{_mandir}/man3/fribidi_*.3*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libfribidi.a
+%endif