Dnia piątek, 20 stycznia 2006 11:32, Andrzej Krzysztofowicz napisał: > Przejrzalem dosc pobieznie. I czy moglbys przypomniec, gdzie znajde reszte > latek? Jakos mi umknely. Pozostałe łatki podsyłam ponownie.
Łatka tłumacząca znajdująca się w cvs-e nie pasowała do nowego tuxpainta (tak jak pozostałe), dlatego zrobiłem ją od nowa nie biorąc pod uwagę starej. Nakładana na starego tuxpointa faktycznie wydaje się absurdalna. -- ___________________________ Linux is like Wigwam. No Gates, No Windows, Apache Inside !!! -- ___________________________ Linux is like Wigwam. No Gates, No Windows, Apache Inside !!!
--- tuxpaint-0.9.15b/src/tuxpaint.desktop.orig 2005-10-11 07:11:38.000000000 +0200 +++ tuxpaint-0.9.15b/src/tuxpaint.desktop 2006-01-19 12:24:42.000000000 +0100 @@ -8,7 +8,7 @@ Name[cs]=Tux Paint Name[cy]=Tux Paint Name[da]=Tux maling -Name[en_gb]=Tux Paint +Name[en_GB]=Tux Paint Name[es]=Tux Paint Name[et]=Joonistame koos Tuksiga! Name[eu]=Tux Paint @@ -24,8 +24,9 @@ Name[nb]=Tux Paint Name[nl]=TuxPaint Name[nn]=Tux Paint -Name[pt_br]=Tux Paint -Name[pt_pt]=Tux Paint +Name[pl]=Tux Paint +Name[pt_BR]=Tux Paint +Name[pt]=Tux Paint Name[ru]=РиŃŃĐš вПоŃŃĐľ Ń Tux! Name[sl]=Tux Paint Name[sw]=Koti ya Rangi @@ -33,8 +34,8 @@ Name[tr]=Tux Boyama Name[vi]=Tux SĆĄn Name[wa]=Tux Paint -Name[zh_cn]=Tux Paint -Name[zh_tw]=çšŞçŤ +Name[zh_CN]=Tux Paint +Name[zh_TW]=çšŞçŤ Type=Application Exec=tuxpaint Icon=tuxpaint @@ -49,7 +50,7 @@ GenericName[cy]=Rhaglen lunio GenericName[da]=Tegneprogram GenericName[de]=Malprogramm -GenericName[en_gb]=Drawing program +GenericName[en_GB]=Drawing program GenericName[es]=Programa de dibujo GenericName[et]=Joonistusprogramm GenericName[eu]=Marrazketa programa @@ -68,8 +69,9 @@ GenericName[nb]=Tegneprogram GenericName[nl]=Tekenprogramma GenericName[nn]=Teikneprogram -GenericName[pt_br]=Programa de desenho -GenericName[pt_pt]=Programa de desenho +GenericName[pl]=Program do rysowania. +GenericName[pt_BR]=Programa de desenho +GenericName[pt]=Programa de desenho GenericName[ru]=ĐŃОгŃаППа Đ´ĐťŃ ŃиŃĐžĐ˛Đ°Đ˝Đ¸Ń GenericName[sl]=Program za slikanje GenericName[sv]=Ritprogram @@ -78,8 +80,8 @@ GenericName[tr]=Ăizim programÄą GenericName[vi]=TrĂŹnh váş˝ GenericName[wa]=Programe di dessinaedje -GenericName[zh_cn]=çťĺžç¨ĺş -GenericName[zh_tw]=çŤĺç¨ĺź +GenericName[zh_CN]=çťĺžç¨ĺş +GenericName[zh_TW]=çŤĺç¨ĺź Comment=A drawing program for children. Comment[af]='n Tekenprogram vir kinders. Comment[be]=ĐСŃŃŃŃĐ°Ń ĐżŃĐ°ĐłŃаПа Đ´ĐťŃ ĐźĐ°ĐťŃванŃĐ˝Ń. @@ -89,7 +91,7 @@ Comment[cy]=Rhaglen lunio ar gyfer plant. Comment[da]=Et tegneprogram for børn Comment[de]=Ein Malprogramm fĂźr (kleine) Kinder. -Comment[en_gb]=A drawing program for children. +Comment[en_GB]=A drawing program for children. Comment[es]=Un programa de dibujo para niĂąos. Comment[et]=Joonistusprogramm lastele. Comment[eu]=Umeentzako marrazketa programa @@ -108,8 +110,9 @@ Comment[nb]=Et tegneprogram for de yngste. Comment[nl]=Een tekenprogramma voor kinderen. Comment[nn]=Eit teikneprogram for dei yngste. -Comment[pt_br]=Um programa de desenho para crianças. -Comment[pt_pt]=Um programa de desenho para crianças. +Comment[pl]=Tux Paint:Prosty program do rysowania dla dzieci. +Comment[pt_BR]=Um programa de desenho para crianças. +Comment[pt]=Um programa de desenho para crianças. Comment[ru]=ĐĐľŃŃĐşĐ°Ń ĐżŃОгŃаППа Đ´ĐťŃ ŃиŃОваниŃ. Comment[sl]=OtroĹĄki program za slikanje. Comment[sv]=Ett ritprogram fĂśr yngre barn. @@ -118,5 +121,7 @@ Comment[tr]=Ăocuklar için bir çizim programÄą Comment[vi]=Máťt chĆ°ĆĄng trĂŹnh váş˝ cho Äᝊa bĂŠ. Comment[wa]=Programe di dessinaedje po ls efants -Comment[zh_cn]=ĺŠĺççťĺžç¨ĺşă -Comment[zh_tw]=ä¸ĺĺ 獼ĺ°ç¨ççŤĺç¨ĺźă +Comment[zh_CN]=ĺŠĺççťĺžç¨ĺşă +Comment[zh_TW]=ä¸ĺĺ 獼ĺ°ç¨ççŤĺç¨ĺźă +Categories=Education;Art; +# vi: set encoding=utf-8
Index: tuxpaint.spec =================================================================== RCS file: /cvsroot/SPECS/tuxpaint.spec,v retrieving revision 1.34 diff -u -r1.34 tuxpaint.spec --- tuxpaint.spec 18 Nov 2004 16:05:52 -0000 1.34 +++ tuxpaint.spec 19 Jan 2006 11:46:07 -0000 @@ -1,22 +1,20 @@ # $Revision: 1.34 $, $Date: 2004/11/18 16:05:52 $ -%define stamps_ver 2004-10-03 +%define stamps_ver 2005.11.25 Summary: Tux Paint - A simple drawing program for children Summary(pl): Tux Paint - Prosty program do rysowania dla dzieci Name: tuxpaint -Version: 0.9.14 -Release: 4 +Version: 0.9.15b +Release: 1 Epoch: 1 License: GPL Group: X11/Applications/Graphics Source0: http://dl.sourceforge.net/tuxpaint/%{name}-%{version}.tar.gz -# Source0-md5: 0b7522c1b3672d5c233f7bbc772c8dec +# Source0-md5: 04995631e0922570a0d5c2216d943941 Source1: http://dl.sourceforge.net/tuxpaint/%{name}-stamps-%{stamps_ver}.tar.gz -# Source1-md5: acb764a25d82843626ff0c1e9ed5da8d +# Source1-md5: 6edf92504b1b9f9943e3b28011738691 Patch0: %{name}-Makefile.patch -Patch1: %{name}-opt.patch -Patch2: %{name}-vfolders.patch -Patch3: %{name}-locale_names.patch -Patch4: %{name}-pl.patch +Patch1: %{name}-loc_vf.patch +Patch2: %{name}-pl.patch URL: http://www.newbreedsoftware.com/tuxpaint/ BuildRequires: SDL_image-devel >= 1.2.2 BuildRequires: SDL_mixer-devel >= 1.2.4 @@ -55,10 +53,8 @@ %prep %setup -q -a 1 %patch0 -p0 -#%patch1 -p1 +%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %{__make} \ @@ -91,7 +87,7 @@ DATA_PREFIX=$RPM_BUILD_ROOT%{_datadir}/%{name}/ chmod -R a+rwx $RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT/usr/share/{doc/tuxpaint,gnome/apps,tuxpaint/CVS} +rm -rf $RPM_BUILD_ROOT%{_datadir}/{doc/tuxpaint,gnome/apps,tuxpaint/CVS} #rm a lot of unwanted files and directories: find docs/ -type d|grep CVS|xargs rm -rf
--- Makefile.orig 2005-11-27 07:44:15.000000000 +0100 +++ Makefile 2006-01-19 11:48:14.000000000 +0100 @@ -17,7 +17,7 @@ # Where to install things: -PREFIX=/usr/local +PREFIX=$(_prefix) # Root directory to place files when creating packages. @@ -63,7 +63,7 @@ X11_ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/X11R6/include/X11/pixmaps GNOME_PREFIX=`gnome-config --prefix` KDE_PREFIX=`kde-config --install apps --expandvars` -KDE_ICON_PREFIX=`kde-config --install icon --expandvars` +#KDE_ICON_PREFIX=`kde-config --install icon --expandvars` # Locale files @@ -95,7 +95,7 @@ # The entire set of CFLAGS: -CFLAGS=-O2 -W -Wall -fno-common -ffast-math \ +CFLAGS=$(OPTFLAGS) -W -Wall -fno-common -ffast-math \ -Wcast-align -Wredundant-decls \ -Wbad-function-cast -Wwrite-strings \ -Waggregate-return \ @@ -361,7 +361,7 @@ rm /usr/share/pixmaps/tuxpaint.png; \ fi -if [ "x$(KDE_PREFIX)" != "x" ]; then \ - rm $(KDE_PREFIX)/Graphics/tuxpaint.desktop; \ + rm $(KDE_PREFIX)/tuxpaint.desktop; \ fi -rm $(ICON_PREFIX)/tuxpaint.png -rm $(X11_ICON_PREFIX)/tuxpaint.xpm @@ -493,9 +493,9 @@ @echo @echo "...Installing launcher icon into KDE..." @if [ "x$(KDE_PREFIX)" != "x" ]; then \ - install -d $(PKG_ROOT)$(KDE_PREFIX)/Graphics; \ - cp src/tuxpaint.desktop $(PKG_ROOT)$(KDE_PREFIX)/Graphics/; \ - chmod 644 $(PKG_ROOT)$(KDE_PREFIX)/Graphics/tuxpaint.desktop; \ + install -d $(PKG_ROOT)$(KDE_PREFIX); \ + cp src/tuxpaint.desktop $(PKG_ROOT)$(KDE_PREFIX); \ + chmod 644 $(PKG_ROOT)$(KDE_PREFIX)/tuxpaint.desktop; \ fi @@ -806,9 +806,9 @@ @chmod 644 $(LOCALE_PREFIX)/pl/LC_MESSAGES/tuxpaint.mo @# @echo " pt_PT ...Portuguese (Portugal)..." - @install -d $(LOCALE_PREFIX)/pt_PT/LC_MESSAGES - @cp trans/pt_pt.mo $(LOCALE_PREFIX)/pt_PT/LC_MESSAGES/tuxpaint.mo - @chmod 644 $(LOCALE_PREFIX)/pt_PT/LC_MESSAGES/tuxpaint.mo + @install -d $(LOCALE_PREFIX)/pt/LC_MESSAGES + @cp trans/pt_pt.mo $(LOCALE_PREFIX)/pt/LC_MESSAGES/tuxpaint.mo + @chmod 644 $(LOCALE_PREFIX)/pt/LC_MESSAGES/tuxpaint.mo @# @echo " ro_RO ...Romanian..." @install -d $(LOCALE_PREFIX)/ro/LC_MESSAGES
_______________________________________________ pld-devel-pl mailing list pld-devel-pl@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
