rpms/tgif/F-10 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tgif.spec, 1.8, 1.9

Fri Nov 20 18:52:48 UTC 2009

Author: mtasaka

Update of /cvs/extras/rpms/tgif/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15085/F-10

Modified Files:
	.cvsignore sources tgif.spec 
Log Message:
* Sat Nov 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.2-1
- 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-10/.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	20 Nov 2009 18:52:48 -0000	1.3
@@ -1,2 +1 @@
-tgif-4.1ja9.tar.gz
-tgif-QPL-4.1.45.tar.gz
+tgif-QPL-4.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-10/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	20 Nov 2009 18:52:48 -0000	1.3
@@ -1,2 +1 @@
-da4d40a12c5053ed73336e041e7a6a93  tgif-4.1ja9.tar.gz
-5c1eba8291385c630b8099fa9b042455  tgif-QPL-4.1.45.tar.gz
+8ec70553a1526fb6ee65cd4e81593363  tgif-QPL-4.2.2.tar.gz


Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-10/tgif.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tgif.spec	15 Nov 2008 05:48:47 -0000	1.8
+++ tgif.spec	20 Nov 2009 18:52:48 -0000	1.9
@@ -1,35 +1,24 @@
-%define		Xresource_ja_ver	4.1ja9
-%define		_default_patch_fuzz	2
-
 Name:		tgif
-Version:	4.1.45
-Release:	8%{?dist}
+Version:	4.2.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
 BuildRequires:	libXmu-devel
+BuildRequires:	libidn-devel
+BuildRequires:	zlib-devel
 Requires:	ghostscript
 Requires:	netpbm-progs
 Requires:	xorg-x11-fonts-75dpi
@@ -43,27 +32,31 @@ 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/|' \
+	-e '/MakeDirectories.*hicolor/s|\$(TGIFDIR)|\$(DATADIR)/icons/|' \
+	Imakefile
 
 %build
 %{__cp} -pf Tgif.tmpl-linux Tgif.tmpl
@@ -91,27 +84,30 @@ popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT/
-# wrap xgif
+
 %{__make} \
 	DESTDIR=$RPM_BUILD_ROOT/ \
 	BINDIR=%{_libexecdir}/ \
 	TGIFDIR=%{_datadir}/tgif/ \
 	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 +124,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 +133,67 @@ 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
+* Sat Nov 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.2-1
+- 4.2.2
+
+* Thu Oct 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.1-1
+- Bug fix release 4.2.1
+
+* 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
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-9
+- F-11: Mass rebuild
+
 * Sat Nov 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-8
 - Add fonts Requirement against xorg-x11-fonts-ISO8859-1-75dpi
 


