rpms/openbox/devel openbox.spec,1.21,1.22
Peter Gordon (pgordon)
fedora-extras-commits at redhat.com
Wed Mar 28 05:24:06 UTC 2007
Author: pgordon
Update of /cvs/extras/rpms/openbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9866/devel
Modified Files:
openbox.spec
Log Message:
* Tue Mar 27 2007 Peter Gordon <peter at thecodergeek.com> - 3.3.1-6
- Split shared libraries into a -libs subpackage to properly handle multilib
setups. (This precludes the further need to %ghost the byte-compiled
themeupdate scripts which was introduced in the previous release.)
- Fix handling of the startup_notification build conditional. It'll actually
work properly now. :)
- Remove the hardcoded RPATH using some sed invocations from the packaging
guidelines.
Index: openbox.spec
===================================================================
RCS file: /cvs/extras/rpms/openbox/devel/openbox.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- openbox.spec 13 Feb 2007 02:58:41 -0000 1.21
+++ openbox.spec 28 Mar 2007 05:23:33 -0000 1.22
@@ -1,6 +1,11 @@
+# According to the upstream version 3.3 changelog, libstartup-notification
+# support doesn't work well and so is disabled by default in this release.
+# Should we forcibly build startup-notification support? [Default: No]
+%bcond_with startup_notification
+
Name: openbox
Version: 3.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A highly configurable and standards-compliant X11 window manager
Group: User Interface/Desktops
@@ -13,14 +18,13 @@
Requires: %{_datadir}/themes
Requires: %{_datadir}/gnome/wm-properties
+Requires: %{name}-libs = %{version}
BuildRequires: gettext
BuildRequires: pango-devel
-# According to the upstream version 3.3 changelog, libstartup-notification
-# support doesn't work well and so is disabled by default in this release.
-# One can enable it optionally, however, by passing
-# "--with startup_notification" as an option to rpmbuild.
-%{?_with_startup_notification:BuildRequires: startup-notification-devel }
+%if %{with startup_notification}
+BuildRequires: startup-notification-devel
+%endif
BuildRequires: libxml2-devel
BuildRequires: libXt-devel
BuildRequires: libXrandr-devel
@@ -44,7 +48,7 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
# Needs these two for the various #include directives in its headers
Requires: libxml2-devel
@@ -55,12 +59,25 @@
developing applications that use %{name}.
+%package libs
+Summary: Shared libraries for %{name}
+Group: Development/Libraries
+
+%description libs
+The %{name}-libs package contains shared libraries used by %{name}.
+
+
%prep
%setup -q
%build
-%configure --disable-static
+%configure \
+ %{?with_startup_notification: --enable-startup-notification} \
+ --disable-static
+## Fix RPATH hardcoding.
+sed -ie 's|^hardcode_libdir_flag_spec=.*$|hardcode_libdir_flag_spec=""|g' libtool
+sed -ie 's|^runpath_var=LD_RUN_PATH$|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
@@ -84,17 +101,16 @@
%{_bindir}/%{name}
%{_datadir}/themes/*/
%{_datadir}/pixmaps/%{name}.png
-%ghost %{_datadir}/%{name}/themeupdate.pyc
-%ghost %{_datadir}/%{name}/themeupdate.pyo
%{_datadir}/%{name}/
%{_datadir}/gnome/wm-properties/%{name}.desktop
%{_datadir}/xsessions/%{name}.desktop
-%{_libdir}/libobrender.so.*
-%{_libdir}/libobparser.so.*
%exclude %{_libdir}/*.la
+%files libs
+%{_libdir}/libobrender.so.*
+%{_libdir}/libobparser.so.*
-%files devel
+%files devel
%doc COPYING
%{_includedir}/%{name}/
%{_libdir}/libobrender.so
@@ -102,13 +118,22 @@
%{_libdir}/pkgconfig/*.pc
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%changelog
+* Tue Mar 27 2007 Peter Gordon <peter at thecodergeek.com> - 3.3.1-6
+- Split shared libraries into a -libs subpackage to properly handle multilib
+ setups. (This precludes the further need to %%ghost the byte-compiled
+ themeupdate scripts which was introduced in the previous release.)
+- Fix handling of the startup_notification build conditional. It'll actually
+ work properly now. :)
+- Remove the hardcoded RPATH using some sed invocations from the packaging
+ guidelines.
+
* Mon Feb 12 2007 Peter Gordon <peter at thecodergeek.com> - 3.3.1-5
- %%ghost the byte-compiled themeupdate scripts to fix multilib conflict
(bug #228379).
More information about the fedora-extras-commits
mailing list