[nautilus-terminal/f16] Switch to 1.0 branch

Hicham HAOUARI hicham at fedoraproject.org
Tue Sep 27 22:24:02 UTC 2011


commit 1a0c407c02235a33b462f79087e729ff679a31af
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Tue Sep 27 22:23:34 2011 +0000

    Switch to 1.0 branch

 .gitignore             |    1 +
 nautilus-terminal.spec |   53 ++++++++++++++++++++++-------------------------
 sources                |    2 +-
 3 files changed, 27 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b595db3..15eef48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /nautilus-terminal_0.7_src.tar.gz
+/nautilus-terminal-1.0-8bzr.tar.bz2
diff --git a/nautilus-terminal.spec b/nautilus-terminal.spec
index 9ec3731..2cb01ef 100644
--- a/nautilus-terminal.spec
+++ b/nautilus-terminal.spec
@@ -1,18 +1,28 @@
-%global debug_package %{nil}
+%define bzr 1
+%define rev 8
+%define rel 0.1
 Name:           nautilus-terminal
-Version:        0.7
-Release:        2%{?dist}
+Version:        1.0
+Release:        %{rel}%{?bzr:.%{rev}bzr}%{?dist}
 Summary:        Terminal embedded in Nautilus
 
 Group:          System Environment/Shells
 License:        GPLv3+
 URL:            http://software.flogisoft.com/nautilus-terminal/en/
+%if %{bzr}
+# This is a bzr snapshot, to get it
+# bzr branch -r %%{rev} lp:nautilus-terminal
+# mv nautilus-terminal %%{name}-%%{version}
+# tar cjf %%{name}-%%{version}-%%{rev}bzr.tar.bz2 %%{name}-%%{version}
+Source0:        %{name}-%{version}-%{rev}bzr.tar.bz2
+%else
 Source0:        http://download.flogisoft.com/files/Software/%{name}/%{name}_%{version}_src.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%endif
+BuildArch:      noarch
 
-BuildRequires:  gettext
-
-Requires:       pygtk2 nautilus-python vte pyxdg
+Requires:       nautilus-python >= 1.0
+Requires:       pygobject2
+Requires:       vte3
 
 %description
 Nautilus Terminal is a terminal embedded in Nautilus, the GNOME's file browser.
@@ -21,34 +31,21 @@ It is always open in the current folder, and follows the navigation
 
 %prep
 %setup -q
-chmod -x AUTHORS
-sed -i 's|/usr/lib/nautilus/extensions-2.0|%{_libdir}/nautilus/extensions-2.0|g' install.sh
+# Remove shebang
+sed -i -e '/^#!\//, 1d' src/nautilus_terminal.py
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
-bash install.sh --package $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
-
-%find_lang %{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -Dpm 644 src/nautilus_terminal.py \
+                 $RPM_BUILD_ROOT%{_datadir}/nautilus-python/extensions/nautilus_terminal.py
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS README
-%{_datadir}/%{name}
-%{_libdir}/nautilus/extensions-2.0/python/%{name}.py*
+%{_datadir}/nautilus-python/extensions/nautilus_terminal.py*
 
 %changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Sep 24 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.7-1
-- New upstream release
-
-* Mon Sep 20 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.6-1
-- Initial package
+* Tue Sep 27 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 1.0-0.1.8bzr
+- Switch to 1.0 branch
diff --git a/sources b/sources
index 5f7ea1c..2ca0405 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-68cecfb4cfb818a1dd0ffed759e7122d  nautilus-terminal_0.7_src.tar.gz
+601f406977f52455e47e2e000c050973  nautilus-terminal-1.0-8bzr.tar.bz2


More information about the scm-commits mailing list