Djam/tuxpaint-config
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/tuxpaint-config.git synced 2025-02-24 15:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

LOG Add patch to fix encoding issues in GUI

Browse source
This commit is contained in:
Andrey Bondrov 2012-10-19 07:02:36 +11:00
parent 2a698899fa
commit 4c545bc56f
2 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tuxpaint-config-0.0.12-locale.patch Normal file
View file

@ -0,0 +1,12 @@
diff -urN tuxpaint-config-0.0.12/src/tuxpaint-config.cxx tuxpaint-config-0.0.12-patched/src/tuxpaint-config.cxx
--- tuxpaint-config-0.0.12/src/tuxpaint-config.cxx 2008-12-02 01:30:24.000000000 +0300
+++ tuxpaint-config-0.0.12-patched/src/tuxpaint-config.cxx 2012-10-18 17:06:06.000000000 +0400
@@ -189,7 +189,7 @@
bindtextdomain("tuxpaint-config", LOCALEDIR);
/* Old version of glibc does not have bind_textdomain_codeset() */
#if defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >=2 || __GLIBC__ > 2 || __APPLE__
- bind_textdomain_codeset("tuxpaint-config", "iso-8859-1");
+ bind_textdomain_codeset("tuxpaint-config", "UTF-8");
#endif
textdomain("tuxpaint-config");

30
tuxpaint-config.spec
View file

@ -1,16 +1,17 @@
Summary: Pictures for use with the paint program Tuxpaint Summary: Pictures for use with the paint program Tuxpaint
Name: tuxpaint-config Name: tuxpaint-config
Version: 0.0.12 Version: 0.0.12
Release: %mkrel 4 Release: 5
License: GPL License: GPL
Source: %{name}-%{version}.tar.bz2
Group: Graphics Group: Graphics
URL: http://sourceforge.net/projects/tuxpaint URL: http://sourceforge.net/projects/tuxpaint
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Source: %{name}-%{version}.tar.bz2
Requires: tuxpaint Patch0: tuxpaint-config-0.0.12-locale.patch
BuildRequires: desktop-file-utils fltk-devel libpaper-devel libxext-devel BuildRequires: desktop-file-utils
BuildRequires: fltk-devel
BuildRequires: libpaper-devel
BuildRequires: pkgconfig(xext)
Requires: tuxpaint
%description %description
Tux Paint Config is a graphical configuration tool for "Tux Paint." Tux Paint Config is a graphical configuration tool for "Tux Paint."
@ -21,13 +22,13 @@ configuration file.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
make OPTFLAGS="%{optflags}" PREFIX=%{_prefix} LIBDIR=%{_libdir} make OPTFLAGS="%{optflags}" PREFIX=%{_prefix} LIBDIR=%{_libdir}
%install %install
rm -rf %{buildroot} mkdir -p %{buildroot} %{buildroot}%{_bindir}
mkdir -p %{buildroot} %{buildroot}%{_bindir}
make install BUILDPREFIX="%{buildroot}" PKG_ROOT="%{buildroot}" PREFIX="%{buildroot}%{_usr}" X11_ICON_PREFIX="%{buildroot}%{_includedir}/X11/pixmaps/" LIBDIR="%{buildroot}%{_libdir}" make install BUILDPREFIX="%{buildroot}" PKG_ROOT="%{buildroot}" PREFIX="%{buildroot}%{_usr}" X11_ICON_PREFIX="%{buildroot}%{_includedir}/X11/pixmaps/" LIBDIR="%{buildroot}%{_libdir}"
install -m644 data/images/icon16x16.png -D %{buildroot}%{_miconsdir}/%{name}.png install -m644 data/images/icon16x16.png -D %{buildroot}%{_miconsdir}/%{name}.png
@ -41,22 +42,19 @@ chmod -R go+r docs/
mkdir -p %{buildroot}%{_datadir}/applications mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor="" \ desktop-file-install --vendor="" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \ --dir %{buildroot}%{_datadir}/applications \
--remove-category="Settings" \ --remove-category="Settings" \
--add-category="Education" \ --add-category="Education" \
src/tuxpaint-config.desktop src/tuxpaint-config.desktop
# fix perms # fix perms
chmod -R go=u-w $RPM_BUILD_ROOT/* chmod -R go=u-w %{buildroot}/*
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang %files -f %{name}.lang
%defattr(755,root,root,755) %defattr(755,root,root,755)
%{_bindir}/%{name} %{_bindir}/%{name}
%doc docs/AUTHORS.txt docs/CHANGES.txt docs/COPYING.txt docs/README.txt docs/TODO.txt docs/html/README.html %doc docs/AUTHORS.txt docs/CHANGES.txt docs/COPYING.txt docs/README.txt docs/TODO.txt docs/html/README.html
%_mandir/man1/%{name}.* %{_mandir}/man1/%{name}.*
%{_includedir}/X11/pixmaps/%{name}.* %{_includedir}/X11/pixmaps/%{name}.*
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/* %{_datadir}/pixmaps/*