diff --git a/.gitignore b/.gitignore index fcd62fa..78d47ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /konversation-1.4.tar.xz -/konversation-1.5-rc1.tar.xz +/konversation-1.5-20130607.tar.bz2 diff --git a/konversation.spec b/konversation.spec index 25d5b43..f4d4cff 100644 --- a/konversation.spec +++ b/konversation.spec @@ -1,17 +1,28 @@ -%define pre rc1 +%define snap 20130607 Name: konversation Version: 1.5 -Release: 0.1.%{pre}%{?dist} +Release: 0.2.%{snap}%{?dist} Summary: A user friendly IRC client Group: Applications/Internet License: GPLv2+ URL: http://konversation.kde.org/ +%if 0%{?snap} +# use releaseme script +Source0: %{name}-%{version}-%{snap}.tar.bz2 +%else Source0: http://download.kde.org/%{?pre:un}stable/konversation/%{version}%{?pre:-%{pre}}/src/konversation-%{version}%{?pre:-%{pre}}.tar.xz +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +## upstream patches +#define git_patches 1 +%if 0%{?git_patches} +BuildRequires: git-core +%endif + BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: kdelibs4-devel @@ -35,6 +46,19 @@ to chat windows; configurable background colors and much more %prep %setup -q -n %{name}-%{version}%{?pre:-%{pre}} +%if 0%{?git_patches} +git init +if [ -z "$GIT_COMMITTER_NAME" ]; then +git config user.email "kde@lists.fedoraproject.org" +git config user.name "Fedora KDE SIG" +fi +git add . +git commit -a -q -m "%{version} baseline." + +# Apply all the patches +git am -p1 %{patches} < /dev/null +%endif + %build mkdir -p %{_target_platform} @@ -86,6 +110,9 @@ fi %changelog +* Fri Jun 07 2013 Rex Dieter 1.5-0.2.20130607 +- 20130607 snapshot + * Sat Mar 16 2013 Rex Dieter 1.5-0.1.rc1 - 1.5-rc1 diff --git a/sources b/sources index a9a75f5..fea7b35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26bfc076ae435582075fe0dacc6c3fa3 konversation-1.5-rc1.tar.xz +81f7ebfcc6b4fd2aac71762f6e536d55 konversation-1.5-20130607.tar.bz2