rpms/konversation/F-7 konversation.spec,1.12,1.13
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Wed Apr 9 18:09:29 UTC 2008
- Previous message (by thread): rpms/gnome-packagekit/devel new-pk-package-available.svg, NONE, 1.1 new-pk-package-available16.png, NONE, 1.1 new-pk-package-available22.png, NONE, 1.1 new-pk-package-available24.png, NONE, 1.1 new-pk-package-available48.png, NONE, 1.1 gnome-packagekit.spec, 1.20, 1.21
- Next message (by thread): rpms/konversation/F-8 konversation-1.0.1-dcop-newline-removal.patch, NONE, 1.1 konversation.spec, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ausil
Update of /cvs/extras/rpms/konversation/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21317
Modified Files:
konversation.spec
Log Message:
apply upstream patch for CVE
Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/F-7/konversation.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- konversation.spec 8 Feb 2008 06:21:04 -0000 1.12
+++ konversation.spec 9 Apr 2008 18:08:44 -0000 1.13
@@ -1,6 +1,6 @@
Name: konversation
Version: 1.0.1
-Release: 4%{?dist}
+Release: 6%{?dist}
Summary: Konversation is a user friendly IRC client for KDE
Group: Applications/Internet
@@ -8,9 +8,19 @@
URL: http://konversation.kde.org
Source0: http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: konversation-1.0.1-dcop-newline-removal.patch
-BuildRequires: kdebase-devel >= 3.4, desktop-file-utils, gettext
-Requires: kdebase >= 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
@@ -22,26 +32,30 @@
%prep
%setup -q
+%patch0 -p1 -b .dcop
%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
-rm -f $RPM_BUILD_ROOT%{_datadir}/apps/konversation/scripts/media
-
## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
@@ -54,9 +68,11 @@
done
fi
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%post
touch --no-create %{_datadir}/icons/hicolor || :
touch --no-create %{_datadir}/icons/crystalsvg || :
@@ -68,13 +84,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 +98,15 @@
%changelog
+* Wed Apr 09 2008 Dennis Gilmore <dennis at ausil.us> - 1.0.1-6
+- apply patch from upstream handling CVE-2007-4400 correctly
+- reenable media script
+
+* 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
@@ -111,7 +136,7 @@
* Sat Oct 20 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-5
- add BuildRequires desktop-file-utils http://fedoraproject.org/wiki/QAChecklist
-- add %post and %postun scriptlets to notify of new icons per
+- add %%post and %%postun scriptlets to notify of new icons per
- http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#implementation_notes
* Sun Jul 03 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-4
- Previous message (by thread): rpms/gnome-packagekit/devel new-pk-package-available.svg, NONE, 1.1 new-pk-package-available16.png, NONE, 1.1 new-pk-package-available22.png, NONE, 1.1 new-pk-package-available24.png, NONE, 1.1 new-pk-package-available48.png, NONE, 1.1 gnome-packagekit.spec, 1.20, 1.21
- Next message (by thread): rpms/konversation/F-8 konversation-1.0.1-dcop-newline-removal.patch, NONE, 1.1 konversation.spec, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list