rpms/tgif/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tgif.spec, 1.10, 1.11 tgif-4.1.35-overthespot_fix.patch, 1.1, NONE tgif-4.1.41.ja.po, 1.1, NONE tgif-4.1.44-xim-bad-focus.patch, 1.1, NONE tgif-4.1.45-fontcheck.patch, 1.1, NONE tgif-QPL-4.1.45-open-with-mode.patch, 1.1, NONE tgif-wrapper.sh, 1.1, NONE tgif.desktop, 1.1, NONE tgif.gif, 1.1, NONE
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Oct 7 20:44:48 UTC 2009
- Previous message (by thread): rpms/tgif/F-12 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tgif.spec, 1.10, 1.11 tgif-4.1.35-overthespot_fix.patch, 1.1, NONE tgif-4.1.41.ja.po, 1.1, NONE tgif-4.1.44-xim-bad-focus.patch, 1.1, NONE tgif-4.1.45-fontcheck.patch, 1.1, NONE tgif-QPL-4.1.45-open-with-mode.patch, 1.1, NONE tgif-wrapper.sh, 1.1, NONE tgif.desktop, 1.1, NONE tgif.gif, 1.1, NONE
- Next message (by thread): rpms/tgif/devel tgif.spec,1.11,1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/tgif/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31573/devel
Modified Files:
.cvsignore sources tgif.spec
Removed Files:
tgif-4.1.35-overthespot_fix.patch tgif-4.1.41.ja.po
tgif-4.1.44-xim-bad-focus.patch tgif-4.1.45-fontcheck.patch
tgif-QPL-4.1.45-open-with-mode.patch tgif-wrapper.sh
tgif.desktop tgif.gif
Log Message:
Update to 4.2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tgif/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 9 Jul 2007 18:08:34 -0000 1.2
+++ .cvsignore 7 Oct 2009 20:44:47 -0000 1.3
@@ -1,2 +1 @@
-tgif-4.1ja9.tar.gz
-tgif-QPL-4.1.45.tar.gz
+tgif-QPL-4.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tgif/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 9 Jul 2007 18:08:34 -0000 1.2
+++ sources 7 Oct 2009 20:44:47 -0000 1.3
@@ -1,2 +1 @@
-da4d40a12c5053ed73336e041e7a6a93 tgif-4.1ja9.tar.gz
-5c1eba8291385c630b8099fa9b042455 tgif-QPL-4.1.45.tar.gz
+5c6540d48ae1c6060af4285175e47f76 tgif-QPL-4.2.tar.gz
Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/devel/tgif.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- tgif.spec 24 Jul 2009 19:45:40 -0000 1.10
+++ tgif.spec 7 Oct 2009 20:44:48 -0000 1.11
@@ -1,31 +1,18 @@
-%define Xresource_ja_ver 4.1ja9
-%define _default_patch_fuzz 2
-
Name: tgif
-Version: 4.1.45
-Release: 10%{?dist}
+Version: 4.2
+Release: 1%{?dist}
Summary: 2-D drawing tool
Group: Applications/Multimedia
License: QPL
URL: http://bourbon.usc.edu/tgif/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-QPL-%{version}.tar.gz
-# Borrowed from Vine Linux
-Source1: tgif-%{Xresource_ja_ver}.tar.gz
-Source2: tgif-4.1.41.ja.po
-Source3: tgif.desktop
-Source4: http://bourbon.usc.edu/tgif/images/%{name}.gif
-Source5: tgif-wrapper.sh
-Patch1: tgif-4.1.45-fontcheck.patch
-Patch3: tgif-4.1.35-overthespot_fix.patch
# http://tyche.pu-toyama.ac.jp/~a-urasim/tgif/
Patch10: tgif-textcursor-a-urasim.patch
-Patch20: tgif-4.1.44-xim-bad-focus.patch
-Patch100: tgif-QPL-4.1.45-open-with-mode.patch
+# Check below later
Patch101: tgif-QPL-4.1.45-size-debug.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
-BuildRequires: ImageMagick
BuildRequires: imake
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -43,27 +30,30 @@ hyper-graphics (or hyper-structured-grap
the World-Wide-Web.
%prep
-%setup -q -n %{name}-QPL-%{version} -a 1
-%patch1 -p1 -b .fontcheck
-%patch3 -p1 -b .overthespot
-%patch10 -p0 -b textcursor
-%patch20 -p1 -b .xim-bad-focus
-%patch100 -p1 -b .opmode
-%patch101 -p1 -b .size
+%setup -q -n %{name}-QPL-%{version}
+# Upstream says the below is wrong, for now dropping
+#%%patch10 -p0 -b textcursor
+# Check later
+#%%patch101 -p1 -b .size
-%{__cp} -pf %{SOURCE2} po/ja/ja.po
-pushd po/ja
%{__perl} -pi \
-e 's,JISX-0208-1983-0,EUC-JP,g' \
- ja.po
-popd
+ po/ja/ja.po
# use scalable bitmap font
-for i in C ja ; do
- %{__sed} -e s,alias\-mincho,misc\-mincho,g \
- -e s,alias\-gothic,jis\-fixed,g \
- -i tgif-%{Xresource_ja_ver}/${i}/Tgif.ad
-done
+%{__sed} \
+ -e s,alias\-mincho,misc\-mincho,g \
+ -e s,alias\-gothic,jis\-fixed,g \
+ -i po/ja/Tgif.ad
+
+# Fix desktop file
+%{__sed} -i.icon -e 's|Icon=tgif|Icon=tgificon|' \
+ po/ja/tgif.desktop
+
+# Fix installation path for icon files
+%{__sed} -i.path \
+ -e '/InstallNonExec.*hicolor/s|\$(TGIFDIR)|\$(DATADIR)/icons/|' \
+ Imakefile
%build
%{__cp} -pf Tgif.tmpl-linux Tgif.tmpl
@@ -91,27 +81,37 @@ popd
%install
%{__rm} -rf $RPM_BUILD_ROOT/
-# wrap xgif
+
+find . -name tgificon.png | while read f
+do
+ dir=$(dirname $f | sed -e 's|^.*icons||')
+ %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$dir
+done
+
%{__make} \
DESTDIR=$RPM_BUILD_ROOT/ \
BINDIR=%{_libexecdir}/ \
TGIFDIR=%{_datadir}/tgif/ \
+ ICONSDIR=icons/ \
INSTALLFLAGS="-cp" \
+ DATADIR=%{_datadir} \
install \
install.man
+
+# wrap tgif
%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}/
-%{__install} -cpm 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/%{name}
+%{__install} -cpm 0755 po/ja/tgif-wrapper.sh \
+ $RPM_BUILD_ROOT%{_bindir}/%{name}
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/tgif/*.obj
%{__install} -cpm 0644 *.obj \
$RPM_BUILD_ROOT%{_datadir}/tgif/
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/X11/{,ja/}app-defaults/
-%if 0
-%{__install} -cpm 0644 tgif-%{Xresource_ja_ver}/C/Tgif.ad \
- $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Tgif
-%endif
-%{__install} -cpm 0644 tgif-%{Xresource_ja_ver}/ja/Tgif.ad \
+
+# Japanese specific
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/
+%{__install} -cpm 0644 \
+ po/ja/Tgif.ad \
$RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/Tgif
pushd po
@@ -128,12 +128,8 @@ desktop-file-install \
--remove-category 'X-Fedora' \
--vendor 'fedora' \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE3}
+ po/ja/tgif.desktop
-%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps/
-convert -geometry 64x64! %{SOURCE4} %{name}.png
-%{__install} -cpm644 %{name}.png \
- $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
%{find_lang} tgif
@@ -141,36 +137,55 @@ convert -geometry 64x64! %{SOURCE4} %{na
%{__rm} -rf $RPM_BUILD_ROOT/
%post
-%{_bindir}/update-desktop-database -q %{_datadir}/applications/ ||:
+touch --no-create %{_datadir}/icons/hicolor
+update-desktop-database -q %{_datadir}/applications/
+exit 0
%postun
-%{_bindir}/update-desktop-database -q %{_datadir}/applications/ ||:
+update-desktop-database -q %{_datadir}/applications/
+
+[ $1 -eq 0 ] || exit 0
+touch --no-create %{_datadir}/icons/hicolor
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+exit 0
+
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+exit 0
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc Copyright HISTORY LICENSE.QPL
-%doc README*
+%doc AUTHORS
+%doc ChangeLog
+%doc Copyright
+%doc HISTORY
+%doc LICENSE.QPL
+%doc README*
%doc VMS_MAKE_TGIF.COM
%doc example.tex
-%doc %{name}-%{Xresource_ja_ver}/README.jp
+%doc po/ja/README.jp
%{_bindir}/%{name}
%{_libexecdir}/%{name}
%{_mandir}/man1/%{name}.1x*
%{_datadir}/%{name}/
-%if 0
-%{_datadir}/X11/app-defaults/Tgif
-%endif
# Currently no package owns the following directories
%dir %{_datadir}/X11/ja/
%dir %{_datadir}/X11/ja/app-defaults/
%{_datadir}/X11/ja/app-defaults/Tgif
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}icon.png
%{_datadir}/applications/*-%{name}.desktop
%changelog
+* Thu Oct 8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2-1
+- Update to 4.2
+ * Almost all patches/sources/etc in Fedora rpms (actually borrowed
+ from Vine Project) were applied upstream
+ * Stop to apply 1 left patch for now
+ * 1 patch does not apply, check later
+
* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-10
- F-12: Mass rebuild
--- tgif-4.1.35-overthespot_fix.patch DELETED ---
--- tgif-4.1.41.ja.po DELETED ---
--- tgif-4.1.44-xim-bad-focus.patch DELETED ---
--- tgif-4.1.45-fontcheck.patch DELETED ---
--- tgif-QPL-4.1.45-open-with-mode.patch DELETED ---
--- tgif-wrapper.sh DELETED ---
--- tgif.desktop DELETED ---
- Previous message (by thread): rpms/tgif/F-12 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tgif.spec, 1.10, 1.11 tgif-4.1.35-overthespot_fix.patch, 1.1, NONE tgif-4.1.41.ja.po, 1.1, NONE tgif-4.1.44-xim-bad-focus.patch, 1.1, NONE tgif-4.1.45-fontcheck.patch, 1.1, NONE tgif-QPL-4.1.45-open-with-mode.patch, 1.1, NONE tgif-wrapper.sh, 1.1, NONE tgif.desktop, 1.1, NONE tgif.gif, 1.1, NONE
- Next message (by thread): rpms/tgif/devel tgif.spec,1.11,1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list