rpms/dillo/FC-4 dillo-i18n.desktop,NONE,1.1 dillo.spec,1.12,1.13

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/dillo/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14677/FC-4

Modified Files:
	dillo.spec 
Added Files:
	dillo-i18n.desktop 
Log Message:
- fix some more aspects of #187691 (package now contains dillo and dillo-i18n)
- fix #197370



--- NEW FILE dillo-i18n.desktop ---
[Desktop Entry]
Name=Dillo (i18n version)
GenericName=Web Browser
Comment=Very small and fast GUI web browser
Exec=dillo-i18n
Icon=dillo.png
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;Network;GTK;


Index: dillo.spec
===================================================================
RCS file: /cvs/extras/rpms/dillo/FC-4/dillo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dillo.spec	18 Jun 2006 08:53:48 -0000	1.12
+++ dillo.spec	4 Jul 2006 10:58:39 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           dillo
 Version:        0.8.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Very small and fast GUI web browser
 
@@ -10,6 +10,7 @@
 Source0:        http://www.dillo.org/download/dillo-0.8.6.tar.bz2
 Source1:        %{name}.desktop
 Source2:        %{name}.png
+Source3:        %{name}-i18n.desktop
 Patch0:         dillo-0.8.0-nodebug.patch
 #http://teki.jpn.ph/pc/software/index-e.shtml#dillo-i18n
 Patch1:         dillo-0.8.6-i18n-misc-20060524.diff.bz2
@@ -22,6 +23,7 @@
 BuildRequires:  libjpeg-devel = 6b
 BuildRequires:  openssl-devel
 BuildRequires:  xorg-x11-devel
+BuildRequires:  fltk-devel
 Requires:       wget
 Provides:       webclient
 
@@ -31,27 +33,62 @@
 
 
 %prep
+# i18n-version
 %setup -q
 %patch0
 %patch1 -p1
+mv ../%{name}-%{version} ../%{name}-%{version}-i18n
+
+# normal version
+%setup -q
+%patch0
 
 %build
+# normal
+%configure --disable-dependency-tracking --enable-ipv6 --enable-anti-alias \
+--enable-meta-refresh --enable-ssl --disable-rpath --disable-dlgui
+
+# i18n
+cd ../%{name}-%{version}-i18n
 %configure --disable-dependency-tracking --enable-ipv6 --enable-anti-alias \
 --enable-meta-refresh --enable-ssl --disable-rpath --disable-dlgui
+
+cd ../%{name}-%{version}
 make %{?_smp_mflags}
 
+cd ../%{name}-%{version}-i18n
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+#i18n
+cd ../%{name}-%{version}-i18n/
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f doc/Makefile*
+
+#normal
+cd ../%{name}-%{version}/
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f doc/Makefile*
 
+# install i18n binary
+%{__install} -p -m0755 ../%{name}-%{version}-i18n/src/dillo \
+$RPM_BUILD_ROOT/%{_bindir}/dillo-i18n
+
+# do the rest
 %{__install} -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
 desktop-file-install --vendor fedora \
         --add-category X-Fedora \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications  \
         %{SOURCE1}
+# i18n
+%{__install} -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
+desktop-file-install --vendor fedora \
+        --add-category X-Fedora \
+        --dir $RPM_BUILD_ROOT/%{_datadir}/applications  \
+        %{SOURCE3}
+
 %{__install} -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/dillo.png
 
 %find_lang dillo
@@ -59,7 +96,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files -f dillo.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog doc
@@ -69,8 +105,12 @@
 %{_datadir}/pixmaps/dillo.png
 %{_libdir}/%{name}
 
-
 %changelog
+* Tue Jul 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.6-2
+- fix some more aspects of #187691 (package now contains dillo and dillo-i18n)
+- fix #197370
+
 * Sun Jun 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.8.6-1
 - version upgrade