rpms/konversation/devel konversation.spec, 1.13, 1.14 kdegcc4.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Mar 10 12:42:32 UTC 2008
- Previous message (by thread): rpms/smartmontools/devel smartmontools-5.38-cloexec.patch,NONE,1.1
- Next message (by thread): rpms/neon/devel neon-0.28.1.tar.gz.asc, NONE, 1.1 .cvsignore, 1.12, 1.13 neon.spec, 1.40, 1.41 sources, 1.11, 1.12 upstream, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/konversation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21617
Modified Files:
konversation.spec
Removed Files:
kdegcc4.patch
Log Message:
* Mon Mar 10 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-5
- drop Requires: kdebase3 (#435873)
- f9+: dfi vendor fedora -> kde
- %doc ChangeLog COPYING README TODO
Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- konversation.spec 8 Feb 2008 06:02:29 -0000 1.13
+++ konversation.spec 10 Mar 2008 12:41:52 -0000 1.14
@@ -1,6 +1,6 @@
Name: konversation
Version: 1.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Konversation is a user friendly IRC client for KDE
Group: Applications/Internet
@@ -9,8 +9,17 @@
Source0: http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kdebase3-devel >= 3.4, desktop-file-utils, gettext
-Requires: kdebase3 >= 3.4
+
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+%if 0%{?fedora} > 8
+BuildRequires: kdelibs3-devel
+%define vendor_path kde
+%else
+BuildRequires: kdelibs-devel
+%define vendor_pre fedora
+%define vendor_prefix -%{vendor_pre}
+%endif
%description
@@ -25,21 +34,27 @@
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure
+
+%configure \
+ --disable-rpath \
+ --enable-new-ldflags \
+ --disable-final
+
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
+
make install DESTDIR=$RPM_BUILD_ROOT
+
desktop-file-install \
---dir $RPM_BUILD_ROOT%{_datadir}/applications \
---vendor=fedora \
---add-category=X-Fedora \
+--dir="$RPM_BUILD_ROOT%{_datadir}/applications/%{?vendor_path}" \
+--vendor="%{?vendor_pre}" \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/konversation.desktop
+# CVE-2007-4400
rm -f $RPM_BUILD_ROOT%{_datadir}/apps/konversation/scripts/media
## File lists
@@ -54,9 +69,11 @@
done
fi
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%post
touch --no-create %{_datadir}/icons/hicolor || :
touch --no-create %{_datadir}/icons/crystalsvg || :
@@ -68,13 +85,13 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc
+%doc ChangeLog COPYING README TODO
%{_bindir}/konversation
%{_bindir}/konversationircprotocolhandler
-%{_datadir}/applications/fedora-konversation.desktop
+%{_datadir}/applications/%{?vendor_path}/%{?vendor_prefix}konversation.desktop
%{_datadir}/apps/kconf_update/*
%{_datadir}/apps/konversation
-%config %{_datadir}/config.kcfg/konversation.kcfg
+%{_datadir}/config.kcfg/konversation.kcfg
%{_datadir}/icons/crystalsvg/*/actions/*
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/services/konvirc.protocol
@@ -82,6 +99,11 @@
%changelog
+* Mon Mar 10 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-5
+- drop Requires: kdebase3 (#435873)
+- f9+: dfi vendor fedora -> kde
+- %%doc ChangeLog COPYING README TODO
+
* Thu Feb 07 2008 Dennis Gilmore <dennis at ausil.us> - 1.0.1-4
- remove /usr/share/apps/konversation/scripts/media for CVE-2007-4400
--- kdegcc4.patch DELETED ---
- Previous message (by thread): rpms/smartmontools/devel smartmontools-5.38-cloexec.patch,NONE,1.1
- Next message (by thread): rpms/neon/devel neon-0.28.1.tar.gz.asc, NONE, 1.1 .cvsignore, 1.12, 1.13 neon.spec, 1.40, 1.41 sources, 1.11, 1.12 upstream, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list