rpms/beryl-plugins/FC-6 .cvsignore, 1.7, 1.8 beryl-plugins.spec, 1.8, 1.9 sources, 1.7, 1.8

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13167

Modified Files:
	.cvsignore beryl-plugins.spec sources 
Log Message:
- Drop unnecessary dep on fedora-logos (#229793)
- Ugh, fine. Build the unsupported plugins (#227539)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-plugins/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Feb 2007 15:38:37 -0000	1.7
+++ .cvsignore	23 Feb 2007 22:02:43 -0000	1.8
@@ -4,3 +4,4 @@
 beryl-plugins-0.1.99.2.tar.bz2
 beryl-plugins-0.1.9999.1.tar.bz2
 beryl-plugins-0.1.9999.2.tar.bz2
+beryl-plugins-unsupported-0.1.9999.2.tar.bz2


Index: beryl-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-plugins/FC-6/beryl-plugins.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- beryl-plugins.spec	22 Feb 2007 15:38:37 -0000	1.8
+++ beryl-plugins.spec	23 Feb 2007 22:02:43 -0000	1.9
@@ -3,21 +3,22 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.9999.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager plug-ins
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
 Source1:        fedora-cubecaps.png
+Source2:        http://releases.beryl-project.org/%{version}/%{name}-unsupported-%{version}.tar.bz2
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x ppc64
 
-Requires:       beryl-core >= %{version}, fedora-logos
+Requires:       beryl-core >= %{version}
 
 BuildRequires:  beryl-core-devel >= %{version}
 BuildRequires:  desktop-file-utils, librsvg2-devel
-BuildRequires:  perl-XML-Parser, gettext-devel, libjpeg-devel
+BuildRequires:  perl(XML::Parser), gettext-devel, libjpeg-devel
 
 Obsoletes:      beryl-dbus <= %{version}-%{release}
 Provides:       beryl-dbus = %{version}-%{release}
@@ -33,12 +34,31 @@
 contents of this package take advantage of.
 
 
+%package unsupported
+Summary: Unsupported beryl plugins
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+
+%description unsupported
+Beryl plugins that are either:
+* unstable
+* only modestly maintained
+* or completely unmaintained
+
+Use at your own risk.
+
+
 %prep
-%setup -q
+%setup -q -a 2
 
 %build
 %configure
 make %{?_smp_mflags}
+# unsupported plugins
+pushd %{name}-unsupported-%{version}
+%configure
+make %{?_smp_mflags}
+popd
 
 
 %install
@@ -46,8 +66,27 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 mv $RPM_BUILD_ROOT%{_datadir}/beryl/cubecaps.png $RPM_BUILD_ROOT%{_datadir}/beryl/cubecaps-beryl.png
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/beryl/cubecaps.png
-find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f
 %find_lang %{name}
+# hack to figure out which plugins are supported
+(cd $RPM_BUILD_ROOT%{_libdir}/beryl/; ls *.so) > supported-plugins
+# unsupported plugins
+pushd %{name}-unsupported-%{version}
+make DESTDIR=$RPM_BUILD_ROOT install
+# even uglier hack to figure out unsupported plugins
+(find . -name "*.la" | xargs grep dlname | cut -f2 -d"'") > ../unsupported-plugins
+popd
+%find_lang %{name}-extra
+# more hacks for supported/unsupported auto-splitting
+for p in $(cat supported-plugins)
+do
+  echo %{_libdir}/beryl/$p >> %{name}.lang
+done
+for p in $(cat unsupported-plugins)
+do
+  echo %{_libdir}/beryl/$p >> %{name}-extra.lang
+done
+# nuke static libs and libtool archives
+find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f
 
 
 %clean
@@ -57,11 +96,17 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-%{_libdir}/beryl/*.so
 %{_datadir}/beryl/*.png
 
+%files unsupported -f %{name}-extra.lang
+%defattr(-,root,root,-)
+
 
 %changelog
+* Fri Feb 23 2007 Jarod Wilson <jwilson at redhat.com> 0.1.9999.2-2
+- Drop unnecessary dep on fedora-logos (#229793)
+- Ugh, fine. Build the unsupported plugins (#227539)
+
 * Tue Feb 20 2007 Jarod Wilson <jwilson at redhat.com> 0.1.9999.2-1
 - beryl 0.1.9999.2 (aka 0.2.0-rc2)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-plugins/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Feb 2007 15:38:37 -0000	1.7
+++ sources	23 Feb 2007 22:02:43 -0000	1.8
@@ -1 +1,2 @@
 1dd90be00f7889cf4cef197b4f8ea7c3  beryl-plugins-0.1.9999.2.tar.bz2
+94cf77e9559e5022ecc88ed718dbcb67  beryl-plugins-unsupported-0.1.9999.2.tar.bz2