X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gai.spec;h=0525e7bf49220c301fe99b91ddce214295e0d3b4;hb=36c54b0d31efc0b7a7ffa5751c6e8c74c3040746;hp=fb99611e425f7aced84be67b4e507bdbaa770815;hpb=c17cb3572e5a606d302cc733621bfd6d69da46ba;p=packages%2Fgai.git

diff --git a/gai.spec b/gai.spec
index fb99611..0525e7b 100644
--- a/gai.spec
+++ b/gai.spec
@@ -8,13 +8,14 @@
 Summary:	General Applet Interface library
 Summary(pl):	Ogólna biblioteka interfejsu apletu
 Name:		gai
-Version:	0.5.6
+Version:	0.5.8
 Release:	1
 License:	LGPL
 Group:		X11/Libraries
-Source0:	http://switch.dl.sourceforge.net/sourceforge/gai/%{name}-%{version}.tar.bz2
-# Source0-md5:	7d14b0e6fe8f431d852b4cd70bc30fe9
+Source0:	http://dl.sourceforge.net/sourceforge/gai/%{name}-%{version}.tar.bz2
+# Source0-md5:	29d90cb37fe5341009b27ffd09f871cb
 Patch0:		%{name}-opt.patch
+Patch1:		%{name}-libdir.patch
 URL:		http://gai.sourceforge.net/
 %{?with_sdl:BuildRequires:	SDL-devel >= 1.2}
 BuildRequires:	autoconf >= 2.53
@@ -24,6 +25,8 @@ BuildRequires:	gtk+2-devel >= 2.0
 BuildRequires:	pkgconfig
 %{?with_rox:BuildRequires:	rox >= 2.1}
 BuildRequires:	zlib-devel
+%{?with_gnome:Provides:	gai(gnome) = %{version}-%{release}}
+%{?with_rox:Provides:	gai(rox) = %{version}-%{release}}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqdep	libGL.so.1 libGLU.so.1
@@ -42,9 +45,17 @@ co aplet powinien robi
 Summary:	Development files for the GAI
 Summary(pl):	Pliki rozwojowe dla GAI
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
+%if %{with gnome}
+Requires:	gnome-panel-devel >= 2.4.0
+Requires:	gai(gnome) = %{version}-%{release}
+Provides:	gai-devel(gnome) = %{version}-%{release}
+%endif
 %{?with_gl:Requires:	gtkglext-devel >= 1.0}
-%{?with_gnome:Requires:	gnome-panel-devel >= 2.4.0}
+%if %{with rox}
+Requires:	gai(rox) = %{version}-%{release}
+Provides:	gai-devel(rox) = %{version}-%{release}
+%endif
 Requires:	gtk+2-devel >= 2.0
 
 %description devel
@@ -56,6 +67,7 @@ Pliki nag
 %prep
 %setup -q 
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__autoconf}
@@ -66,13 +78,15 @@ Pliki nag
 	%{!?with_sdl:--disable-sdl}
 
 %{__make} \
-	OPT="%{rpmcflags}"
+	OPT="%{rpmcflags} -fPIC"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	PREFIX=$RPM_BUILD_ROOT%{_prefix}
+	DESTDIR=$RPM_BUILD_ROOT \
+	PREFIX=%{_prefix} \
+	LIBDIR=%{_libdir}
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -rf examples/[!C]* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}