rpms/xdg-utils/devel xdg-utils-1.0.2-htmlview.patch, NONE, 1.1 xdg-utils-cvs_checkout.sh, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.8, 1.9 xdg-utils.spec, 1.16, 1.17 xdg-utils-1.0.1-htmlview.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1323

Modified Files:
	.cvsignore sources xdg-utils.spec 
Added Files:
	xdg-utils-1.0.2-htmlview.patch xdg-utils-cvs_checkout.sh 
Removed Files:
	xdg-utils-1.0.1-htmlview.patch 
Log Message:
* Fri Nov 21 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.2-5.20081121cvs
- upstreamed a few more patches, rebase to cvs snapshot


xdg-utils-1.0.2-htmlview.patch:

--- NEW FILE xdg-utils-1.0.2-htmlview.patch ---
diff -up xdg-utils/scripts/xdg-open.in.htmlview xdg-utils/scripts/xdg-open.in
--- xdg-utils/scripts/xdg-open.in.htmlview	2008-01-24 14:24:51.000000000 -0600
+++ xdg-utils/scripts/xdg-open.in	2008-11-21 14:00:34.000000000 -0600
@@ -130,7 +130,7 @@ detectDE
 if [ x"$DE" = x"" ]; then
     # if BROWSER variable is not set, check some well known browsers instead
     if [ x"$BROWSER" = x"" ]; then
-        BROWSER=firefox:mozilla:netscape
+        BROWSER=htmlview:firefox:mozilla:netscape:links:lynx
     fi
     DE=generic
 fi


--- NEW FILE xdg-utils-cvs_checkout.sh ---
#!/bin/bash


MODULE=$(basename $0 -cvs_checkout.sh)
DATE=$(date +%Y%m%d)

set -x

rm -rf $MODULE

cvs -z3 -d:pserver:anonymous at cvs.freedesktop.org:/cvs/portland checkout -P portland/$MODULE 
pushd portland
tar czf ../$MODULE-${DATE}cvs.tgz $MODULE
popd

rm -rf portland 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	25 Jan 2008 14:19:51 -0000	1.9
+++ .cvsignore	21 Nov 2008 20:25:45 -0000	1.10
@@ -1 +1 @@
-xdg-utils-1.0.2.tgz
+xdg-utils-20081121cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Jun 2007 03:24:08 -0000	1.8
+++ sources	21 Nov 2008 20:25:45 -0000	1.9
@@ -1 +1 @@
-348a5b91dc66426505022c74a64b2940  xdg-utils-1.0.2.tgz
+7a48ac172faa3e8acaf383185b050830  xdg-utils-20081121cvs.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xdg-utils.spec	25 Jan 2008 14:19:51 -0000	1.16
+++ xdg-utils.spec	21 Nov 2008 20:25:46 -0000	1.17
@@ -1,20 +1,32 @@
 
+%define cvs 20081121cvs
+
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 4%{?dist}
+Release: 5.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
+%if 0%{?cvs:1}
+Source0: xdg-utils-%{cvs}.tgz
+Source1: xdg-utils-cvs_checkout.sh
+%else
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
+%endif
 License: MIT 
 Group:   System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-Patch1: xdg-utils-1.0.2-mimeopen.patch
-Patch2: xdg-utils-1.0.1-typo.patch
-Patch3: xdg-utils-1.0.1-htmlview.patch
-Patch4: xdg-utils-1.0.2-CVE-2008-0386.patch
+Patch1: xdg-utils-1.0.2-htmlview.patch
+
+## upstream patches
+Patch101: xdg-utils-1.0.2-mimeopen.patch
+Patch102: xdg-utils-1.0.1-typo.patch
+Patch104: xdg-utils-1.0.2-CVE-2008-0386.patch
+
+BuildRequires: gawk
+BuildRequires: xmlto
 
 Requires: coreutils
 Requires: desktop-file-utils
@@ -53,18 +65,23 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta}
+#setup -q -n %{name}-%{version}%{?beta}
+%setup -q -n %{name}
 
-%patch1 -p1 -b .mimeopen
-%patch2 -p1 -b .typo
-%patch3 -p1 -b .htmlview
-%patch4 -p1 -b .CVE-2008-0386
+%patch1 -p1 -b .htmlview
+
+%if ! 0%{?cvs:1}
+%patch101 -p1 -b .mimeopen
+%patch102 -p1 -b .typo
+%patch104 -p1 -b .CVE-2008-0386
+%endif%
 
 
 %build
 %configure
 
 make %{?_smp_mflags}
+make -C scripts scripts
 
 
 %install
@@ -85,6 +102,9 @@
 
 
 %changelog
+* Fri Nov 21 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.2-5.20081121cvs
+- upstreamed a few more patches, rebase to cvs snapshot
+
 * Fri Jan 25 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.0.2-4
 - Fix for CVE-2008-0386 (#429513)
 


--- xdg-utils-1.0.1-htmlview.patch DELETED ---