From cff0940a2619b81782b071c69f5fe1d69a41e36d Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Wed, 7 May 2014 19:18:57 +0200
Subject: [PATCH] Split out a vte-profile subpackage

... that can be used with both vte291 / vte3.
---
 vte291.spec | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/vte291.spec b/vte291.spec
index c9c1295..2b97919 100644
--- a/vte291.spec
+++ b/vte291.spec
@@ -2,7 +2,7 @@
 
 Name:           vte291
 Version:        0.37.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Terminal emulator library
 
 License:        LGPLv2+
@@ -20,6 +20,7 @@ BuildRequires:  vala-tools
 
 # initscripts creates the utmp group
 Requires:       initscripts
+Requires:       vte-profile
 
 %description
 VTE is a library implementing a terminal emulator widget for GTK+. VTE
@@ -37,6 +38,20 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+# vte-profile is deliberately not noarch to avoid having to obsolete a noarch
+# subpackage in the future when we get rid of the vte3 / vte291 split. Yum is
+# notoriously bad when handling noarch obsoletes and insists on installing both
+# of the multilib packages (i686 + x86_64) as the replacement.
+%package -n     vte-profile
+Summary:        Profile script for VTE terminal emulator library
+License:        GPLv3+
+# vte.sh was previously part of the vte3 package
+Conflicts:      vte3 < 0.36.1-3
+
+%description -n vte-profile
+The vte-profile package contains a profile.d script for the VTE terminal
+emulator library.
+
 %prep
 %setup -q -n vte-%{version}
 %patch2 -p1 -b .motion
@@ -56,10 +71,6 @@ make %{?_smp_mflags} V=1
 %install
 %make_install
 
-# Rename the profile script for parallel installability
-mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/vte.sh \
-   $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/vte-%{apiver}.sh
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang vte-%{apiver}
@@ -70,7 +81,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %files -f vte-%{apiver}.lang
 %doc COPYING NEWS README
-%{_sysconfdir}/profile.d/vte-%{apiver}.sh
 %{_libdir}/libvte-%{apiver}.so.0*
 %dir %{_libdir}/vte-%{apiver}
 %attr(2711,root,utmp) %{_libdir}/vte-%{apiver}/gnome-pty-helper
@@ -85,6 +95,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %doc %{_datadir}/gtk-doc/
 %{_datadir}/vala/
 
+%files -n vte-profile
+%{_sysconfdir}/profile.d/vte.sh
+
 %changelog
+* Wed May 07 2014 Kalev Lember <kalevlember@gmail.com> - 0.37.0-2
+- Split out a vte-profile subpackage that can be used with both vte291 / vte3
+
 * Tue May 06 2014 Kalev Lember <kalevlember@gmail.com> - 0.37.0-1
 - Initial Fedora package, based on previous vte3 0.36 packaging