[gedit-valencia] Snapshot release with gedit 3 support

[Michel Alexandre Salim]

commit c56fbacf946e7e2ed1bf8117eb0cea19f921d466
Author: Michel Alexandre Salim <michel.salim at cs.fau.de>
Date:   Thu Jul 7 15:42:36 2011 +0200

    Snapshot release with gedit 3 support

 .gitignore          |    2 +-
 gedit-valencia.spec |   40 ++++++++++++++++++++--------------------
 sources             |    2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c9fc774..a96ba57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/valencia-0.3.0.tar.bz2
+/valencia-0.3.0-808152718e3ab.tar.xz
diff --git a/gedit-valencia.spec b/gedit-valencia.spec
index 3f6b3f6..13f6933 100644
--- a/gedit-valencia.spec
+++ b/gedit-valencia.spec
@@ -1,34 +1,31 @@
 # when Koji is building SRPM, dependencies won't be installed yet
-%if %($(pkg-config gedit-2.20 || pkg-config gedit) ; echo $?)
-# This will get overridden by pkg-config; defaulting to the version in F9
-%global gedit_version 22.2
+%if %($(pkg-config gedit) ; echo $?)
+# This will get overridden by pkg-config; defaulting to minimum req
+%global gedit_version 2.91.0
 %else
-%if 0%{?fedora} >= 15
 %global gedit_version %(pkg-config gedit --modversion)
-%else
-%global gedit_version %(pkg-config gedit-2.20 --modversion)
-%endif
 %endif
 
 %global debug_package %{nil}
 %global major_ver 0.3
 
-%if 0%{?fedora} == 14 || 0%{?rhel} >= 6
-%global valapkg vala-0.10
-%endif
+%global commit_hash 808152718e3ab
+%global alphatag    20110701git%{commit_hash}
 
 Name:           gedit-valencia
 Version:        %{major_ver}.0
-Release:        5%{?dist}
+Release:        6.%{alphatag}%{?dist}
 Summary:        A gedit plugin providing lightweight Vala IDE
 
 Group:          Development/Tools
 License:        LGPLv2+
 URL:            http://yorba.org/valencia
-Source0:        http://yorba.org/download/valencia/%{major_ver}/valencia-%{version}.tar.bz2
+# git archive --format=tar --prefix=valencia-%%{version}-%%{commit_hash}/ %%{commit_hash} | xz > ../valencia-%%{version}-%%{commit_hash}.tar.xz
+Source0:        valencia-%{version}-%{commit_hash}.tar.xz
+#Source0:        http://yorba.org/download/valencia/%{major_ver}/valencia-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gedit-devel vala-devel libgee-devel vte-devel
+BuildRequires:  gedit-devel vala-devel libgee-devel vte3-devel
 Requires:       gedit >= %{gedit_version}
 
 %description
@@ -40,13 +37,13 @@ suggestions by invoking autocomplete in the appropriate context.
 
 
 %prep
-%setup -q -n valencia-%{version}
+%setup -q -n valencia-%{version}-%{commit_hash}
 
-%if 0%{?fedora} >=14 || 0%{?rhel} >= 6
+#if 0%{?fedora} >=14 || 0%{?rhel} >= 6
 # These distributions have vala >= 0.9.5, which provide
 # vala-%%{api_ver} not vala-1.0
-sed -i.fix_valapkg "s|vala-1.0|%{valapkg}|" Makefile
-%endif
+#sed -i.fix_valapkg "s|vala-1.0|%{valapkg}|" Makefile
+#endif
 
 
 %build
@@ -61,11 +58,11 @@ make %{?_smp_mflags} VFLAGS="$VFLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-PLUGINDIR=$RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins
+PLUGINDIR=$RPM_BUILD_ROOT%{_libdir}/gedit/plugins
 mkdir -p $PLUGINDIR
 # no debuginfo generation; need to strip the library by hand
 strip libvalencia.so
-cp -p libvalencia.so valencia.gedit-plugin $PLUGINDIR
+cp -p libvalencia.so valencia.plugin $PLUGINDIR
 
 
 %clean
@@ -75,11 +72,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README THANKS
-%{_libdir}/gedit-2/plugins/*valencia*
+%{_libdir}/gedit/plugins/*valencia*
 
 
 
 %changelog
+* Thu Jul  7 2011 Michel Salim <salimma at fedoraproject.org> - 0.3.0-6.20110701git808152718e3ab
+- Snapshot release with gedit 3 support
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index f1ad669..f618028 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e4829cbbc6eb917d539447fda38e437  valencia-0.3.0.tar.bz2
+cb77f0e1e3388f0563ad8a4db9fe0b4f  valencia-0.3.0-808152718e3ab.tar.xz