[konversation] .spec cleanup
Rex Dieter
rdieter at fedoraproject.org
Thu Jun 19 12:59:01 UTC 2014
commit 119e8cb39b7ebff09d50211ab5f8d744069ca088
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Thu Jun 19 07:58:58 2014 -0500
.spec cleanup
konversation.spec | 31 ++++---------------------------
1 files changed, 4 insertions(+), 27 deletions(-)
---
diff --git a/konversation.spec b/konversation.spec
index 1f58d75..3b68d19 100644
--- a/konversation.spec
+++ b/konversation.spec
@@ -1,10 +1,9 @@
Name: konversation
Version: 1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A user friendly IRC client
-Group: Applications/Internet
License: GPLv2+
URL: http://konversation.kde.org/
%if 0%{?snap}
@@ -13,13 +12,8 @@ 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
@@ -44,19 +38,6 @@ 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 at 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}
@@ -68,8 +49,6 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
-rm -rf %{buildroot}
-
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang konversation --with-kde
@@ -79,10 +58,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/konversation.desktop
-%clean
-rm -rf %{buildroot}
-
-
%post
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -97,7 +72,6 @@ fi
%files -f konversation.lang
-%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%{_kde4_bindir}/konversation
%{_kde4_datadir}/applications/kde4/konversation.desktop
@@ -108,6 +82,9 @@ fi
%changelog
+* Thu Jun 19 2014 Rex Dieter <rdieter at fedoraproject.org> 1.5-4
+- .spec cleanup
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list