spot pushed to gnome-shell-extension-pidgin (master). "dont package .git or .po, mark license files, use sane upstream source"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Mar 25 19:07:38 UTC 2015
>From ee10bc63721e5cae7cbbc1f579c3c1bfd158c702 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Wed, 25 Mar 2015 14:52:52 -0400
Subject: dont package .git or .po, mark license files, use sane upstream
source
diff --git a/.gitignore b/.gitignore
index 92d0d8f..ab6c761 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/gnome-shell-extension-pidgin-git87fc23433d.tar.bz2
/gnome-shell-extension-pidgin-git1a254319ea.tar.bz2
/pidgin-im-gnome-shell-extension-gitf1beeeb7ce.tar.bz2
+/pidgin-im-gnome-shell-extension-f1beeeb7ce025f749d1e5b3f5d423c9e46760f97.tar.gz
diff --git a/gnome-shell-extension-pidgin.spec b/gnome-shell-extension-pidgin.spec
index ee24493..4121e9e 100644
--- a/gnome-shell-extension-pidgin.spec
+++ b/gnome-shell-extension-pidgin.spec
@@ -1,16 +1,15 @@
-%global git f1beeeb7ce
+%global commit f1beeeb7ce025f749d1e5b3f5d423c9e46760f97
+%global project pidgin-im-gnome-shell-extension
%global uuid pidgin at muffinmad
Name: gnome-shell-extension-pidgin
Version: 0
-Release: 0.16.git%{git}%{?dist}
+Release: 0.17.git%(c=%{commit}; echo ${c:0:7})%{?dist}
Summary: The components necessary to integrate Pidgin with GNOME Shell
Group: User Interface/Desktops
License: GPLv2+
-URL: https://github.com/muffinmad/pidgin-im-gnome-shell-extension
-# git clone https://github.com/muffinmad/pidgin-im-gnome-shell-extension.git
-# tar cfj pidgin-im-gnome-shell-extension-gitf1beeeb7ce.tar.bz2 pidgin-im-gnome-shell-extension
-Source0: pidgin-im-gnome-shell-extension-git%{git}.tar.bz2
+URL: https://github.com/muffinmad/%{project}
+Source0: https://github.com/muffinmad/%{project}/archive/%{commit}/%{project}-%{commit}.tar.gz
Source1: http://download.sourceforge.net/project/gnomeshpidgin/gnomeShellPidgin.c
Source2: Makefile.gnomeShellPidgin
# Had to clarify licensing on Mohd Izhar Firdaus Bin Ismail's gnome-shell-extensions-pidgin
@@ -37,13 +36,14 @@ In order to activate these components, you will need to:
%prep
%setup -c -n %{name}
+mv %{project}-%{commit} %{uuid}
cp %{SOURCE1} .
cp %{SOURCE2} Makefile
cp %{SOURCE3} .
cp %{SOURCE4} .
%patch0 -p0 -b .cleanup
%patch3 -p1 -b .fixups
-pushd pidgin-im-gnome-shell-extension/schemas
+pushd %{uuid}/schemas
/usr/bin/glib-compile-schemas .
popd
@@ -54,15 +54,19 @@ make CFLAGS="%{optflags}"
make DESTDIR=%{buildroot} LIBDIR=%{_libdir} install
mkdir -p %{buildroot}%{_datadir}/gnome-shell/extensions
-mv pidgin-im-gnome-shell-extension %{uuid}
cp -a %{uuid} %{buildroot}%{_datadir}/gnome-shell/extensions/
%files
-%doc gpl-2.0.txt gnome-shell-extensions-pidgin-License.txt
+%license gpl-2.0.txt gnome-shell-extensions-pidgin-License.txt
%{_datadir}/gnome-shell/extensions/%{uuid}/
+%exclude %{_datadir}/gnome-shell/extensions/%{uuid}/locale/*/*/*.po
%{_libdir}/purple-2/libgnomeshell.so
%changelog
+* Wed Feb 25 2015 Ville Skyttä <ville.skytta at iki.fi> - 0-0.17.gitf1beeeb
+- Switch to github provided tarball, don't ship .git or *.po
+- Mark license files as %%license
+
* Tue Jan 20 2015 Tom Callaway <spot at fedoraproject.org> - 0-0.16.git1a254319ea
- switch to pidgin-im-gnome-shell-extension at muffinmad
diff --git a/sources b/sources
index 6746b1d..5833f71 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f374a140aad161578036530de7653f45 pidgin-im-gnome-shell-extension-gitf1beeeb7ce.tar.bz2
+fd7fe14b837c2b3363b8e81dccf2f90b pidgin-im-gnome-shell-extension-f1beeeb7ce025f749d1e5b3f5d423c9e46760f97.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/gnome-shell-extension-pidgin.git/commit/?h=master&id=ee10bc63721e5cae7cbbc1f579c3c1bfd158c702
More information about the scm-commits
mailing list