- packaged VCMI data files, keep main library in subdir (there is rpath), rel. 2

Changed files:
    vcmi.spec -> 1.4

diff --git a/vcmi.spec b/vcmi.spec
index 17c6a200e476a08a43ccdfb555a7fbd60927816a..a61a59574ebbc17d6cf97fd91f5c78732b9e635f 100644 (file)
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -1,11 +1,13 @@
 Summary:       Heroes 3: WoG recreated
 Name:          vcmi
 Version:       0.89
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications/Games
 Source0:       http://dl.dropbox.com/u/22372764/vcmi/packages/%{name}_%{version}.tar.gz
 # Source0-md5: 3f67cabb2b395f933b0e14c412e0f0f9
+Source1:       http://download.vcmi.eu/%{name}-data_%{version}.tar.gz
+# Source1-md5: e6018250e5363c440c5dcbf2492eda24
 BuildRequires: SDL-devel
 BuildRequires: SDL_image-devel
 BuildRequires: SDL_mixer-devel
@@ -18,7 +20,7 @@ BuildRequires:        zlib-devel
 BuildRequires: libstdc++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# object defined in binaries and main library
+# symbols defined in binaries and main library
 %define        skip_post_check_so      vcmi/Scripting/libvcmiERM.so.0.0.0
 
 %description
@@ -45,20 +47,17 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{Data,Maps,Mp3,Sprites,config}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/AI/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}{/Scripting,}/*.{la,so}
 
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/{%{name}/lib%{name}.so*,}
+%{__tar} zxf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/%{name}*
-%attr(755,root,root) %{_libdir}/lib%{name}*.so.?.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib%{name}*.so.?
+%attr(755,root,root) %{_libdir}/%{name}/lib%{name}*.so.?.*.*
+%attr(755,root,root) %ghost %{_libdir}/%{name}/lib%{name}*.so.?
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/AI
 %attr(755,root,root) %{_libdir}/%{name}/AI/lib*.so