From 461386361eef66292e4c2bf88044bfd3336e4094 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Jul 22 2005 17:20:06 +0000 Subject: Delete obsolete patch and use an ugly %find_lang hack which also works with FC3. --- diff --git a/wesnoth-64bit.patch b/wesnoth-64bit.patch deleted file mode 100644 index 416af51..0000000 --- a/wesnoth-64bit.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- wesnoth-0.8/src/image.cpp.64bit 2005-05-26 11:59:06.000000000 -0400 -+++ wesnoth-0.8/src/image.cpp 2005-05-26 11:59:44.000000000 -0400 -@@ -472,7 +472,7 @@ - if(minimap == NULL) - return NULL; - -- std::cerr << "created minimap: " << int(minimap) << "," << int(minimap->pixels) << "\n"; -+ std::cerr << "created minimap: " << minimap << "," << minimap->pixels << "\n"; - - typedef mini_terrain_cache_map cache_map; - cache_map& cache = mini_terrain_cache; -@@ -523,7 +523,7 @@ - } - } - -- std::cerr << "scaling minimap..." << int(minimap) << "." << int(minimap->pixels) << "\n"; -+ std::cerr << "scaling minimap..." << minimap << "." << minimap->pixels << "\n"; - - if((minimap->w != w || minimap->h != h) && w != 0) { - const scoped_sdl_surface surf(minimap); ---- wesnoth-0.8/src/multiplayer_lobby.cpp.64bit 2005-05-26 12:01:48.000000000 -0400 -+++ wesnoth-0.8/src/multiplayer_lobby.cpp 2005-05-26 12:01:58.000000000 -0400 -@@ -114,7 +114,7 @@ - - //generate a unique id to show the map as - char buf[50]; -- sprintf(buf,"addr %d",(int)mini); -+ sprintf(buf,"addr %d",(int)(long)mini); - - image::register_image(buf,mini); - ---- wesnoth-0.8/src/widgets/menu.cpp.64bit 2005-05-26 12:07:02.000000000 -0400 -+++ wesnoth-0.8/src/widgets/menu.cpp 2005-05-26 12:07:13.000000000 -0400 -@@ -389,8 +389,8 @@ - x = event.button.x; - y = event.button.y; - } else { -- x = (int)event.user.data1; -- y = (int)event.user.data2; -+ x = (int)(long)event.user.data1; -+ y = (int)(long)event.user.data2; - } - - const int item = hit(x,y); diff --git a/wesnoth.spec b/wesnoth.spec index 3b3d86c..21ff772 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -85,7 +85,8 @@ install -Dpm 755 %{SOURCE1} \ install -Dpm 644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth -/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name --all-name +%find_lang %{name}.\* +#/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name --all-name find $RPM_BUILD_ROOT -name ".cvs*" | xargs rm -f find $RPM_BUILD_ROOT -name "CVS" | xargs rm -rf @@ -114,7 +115,7 @@ if [ $1 -eq 0 ]; then fi -%files -f %{name}.lang +%files -f %{name}.\*.lang %defattr(-,root,root,-) %doc COPYING changelog README copyright MANUAL* README.fedora %{_bindir}/wesnoth