From 24ffef4cf0189b68e50ab0e6bc717b64831c36b5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Nov 29 2015 13:39:57 +0000 Subject: Try the latest git --- diff --git a/.gitignore b/.gitignore index 750b475..3cca720 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ lxterminal-0.1.8.tar.gz /lxterminal-0.1.9.tar.gz /lxterminal-0.1.11.tar.gz /lxterminal-0.2.0.tar.gz +/lxterminal-0.2.0-D20151126gitbe658ad3.tar.bz2 diff --git a/create-tarball-from-git.sh b/create-tarball-from-git.sh new file mode 100644 index 0000000..22d3b26 --- /dev/null +++ b/create-tarball-from-git.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +set -e +set -x + +CURRENTDIR=$(pwd) +PKGNAME=lxterminal + +TMPDIR=$(mktemp -d /var/tmp/$PKGNAME-XXXXXX) +pushd $TMPDIR + +GITSCM=git://git.lxde.org/lxde/$PKGNAME.git + +git clone $GITSCM +pushd lxterminal + +COMMIT=$(git log | head -n 1 | sed -e 's|^.*[ \t]||') +SHORTCOMMIT=$(echo $COMMIT | cut -c-8) +DATE=$(git show --format=%ci $COMMIT | head -n 1 | sed -e 's|[ \t].*$||') +SHORTDATE=$(echo $DATE | sed -e 's|-||g') +VERSION=$(cat configure.ac | grep AC_INIT | sed -n -e 's|^.*,[ \t]*\([0-9\.][0-9\.]*\)[ \t]*,.*$|\1|p') + +echo "VERSION=$VERSION" +echo "COMMIT=$COMMIT" +echo "DATE=$DATE" + +echo +popd + +TARDIR=$PKGNAME-${VERSION}-D${SHORTDATE}git${SHORTCOMMIT} +ln -sf $PKGNAME $TARDIR +tar cjf ${TARDIR}.tar.bz2 ${TARDIR}/./ + +mv ${TARDIR}.tar.bz2 ${CURRENTDIR}/ +popd + +rm -rf $TMPDIR + diff --git a/lxterminal.spec b/lxterminal.spec index 86eb378..c3c620a 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -2,25 +2,49 @@ %global with_desktop_vendor_tag 1 %endif +%global git_snapshot 1 + +%if 0%{?git_snapshot} +%global git_rev be658ad344e330744abda053f01f2d46d2bdb1da +%global git_date 20151126 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version D%{git_date}git%{git_short} +%endif + Name: lxterminal Version: 0.2.0 -Release: 2%{?dist} +Release: 3%{?git_version:.%{?git_version}}%{?dist} Summary: Desktop-independent VTE-based terminal emulator Summary(de): Desktop-unabhängiger VTE-basierter Terminal Emulator Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.sourceforge.net/ -#VCS: git:git://lxde.git.sourceforge.net/gitroot/lxde/lxterminal +%if 0%{?git_snapshot} +Source0: %{name}-%{version}-%{?git_version}.tar.bz2 +%else Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%endif +# Shell script to create tarball from git scm +Source100: create-tarball-from-git.sh -BuildRequires: gtk2-devel >= 2.6 -BuildRequires: vte-devel >= 0.20.0 -BuildRequires: desktop-file-utils intltool gettext -BuildRequires: %{_bindir}/xsltproc -BuildRequires: docbook-utils -BuildRequires: docbook-style-xsl +BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.6.0 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(vte) + +BuildRequires: %{_bindir}/xsltproc +BuildRequires: docbook-utils +BuildRequires: docbook-style-xsl + +BuildRequires: desktop-file-utils +BuildRequires: intltool +BuildRequires: gettext + +%if 0%{?git_snapshot} +BuildRequires: automake +BuildRequires: libtool +%endif %description LXterminal is a VTE-based terminal emulator with support for multiple tabs. @@ -35,9 +59,11 @@ Abhängigkeiten. Um den Speicherverbrauch zu reduzieren und die Leistung zu erhöhen teilen sich alle Instanzen des Terminals einen einzigen Prozess. %prep -%setup -q +%setup -q %{?git_version:-n %{name}-%{version}-%{?git_version}} %build +%{?git_version:sh autogen.sh} + %configure \ --enable-man \ --disable-silent-rules \ @@ -45,10 +71,9 @@ erhöhen teilen sich alle Instanzen des Terminals einen einzigen Prozess. make %{?_smp_mflags} - %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + desktop-file-install \ %if 0%{?with_desktop_vendor_tag} --vendor fedora \ @@ -72,13 +97,11 @@ fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING README +%doc AUTHORS +%license COPYING +%doc README %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/*%{name}.desktop @@ -87,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 29 2015 Mamoru TASAKA - 0.2.0-3.D20151126gitbe658ad3 +- Try the latest git + * Thu Jul 23 2015 Mamoru TASAKA - 0.2.0-2 - Fix scriptlet diff --git a/sources b/sources index 446ebd1..e941f2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e80ad1b6e26212f3d43908c2ad87ba4d lxterminal-0.2.0.tar.gz +80a995ed20889cda65998f34ad62c170 lxterminal-0.2.0-D20151126gitbe658ad3.tar.bz2