rpms/beryl-settings/FC-6 .cvsignore, 1.5, 1.6 beryl-settings.spec, 1.4, 1.5 sources, 1.5, 1.6

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	.cvsignore beryl-settings.spec sources 
Log Message:
beryl 0.1.9999.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jan 2007 21:38:49 -0000	1.5
+++ .cvsignore	5 Feb 2007 16:18:55 -0000	1.6
@@ -4,3 +4,6 @@
 beryl-settings-0.1.99.2.tar.bz2
 beryl-settings-bindings-0.1.99.2.tar.bz2
 beryl-settings-simple-0.1.99.2.tar.bz2
+beryl-settings-0.1.9999.1.tar.bz2
+beryl-settings-bindings-0.1.9999.1.tar.bz2
+beryl-settings-simple-0.1.9999.1.tar.bz2


Index: beryl-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/FC-6/beryl-settings.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- beryl-settings.spec	29 Jan 2007 21:38:49 -0000	1.4
+++ beryl-settings.spec	5 Feb 2007 16:18:55 -0000	1.5
@@ -2,7 +2,7 @@
 Url:            http://www.beryl-project.org/
 License:        GPL
 Group:          User Interface/Desktops
-Version:        0.1.99.2
+Version:        0.1.9999.1
 Release:        1%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager GUI config utility
@@ -10,12 +10,11 @@
 Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
 Source1:        http://releases.beryl-project.org/%{version}/%{name}-bindings-%{version}.tar.bz2
 Source2:        http://releases.beryl-project.org/%{version}/%{name}-simple-%{version}.tar.bz2
-Source3:        %{name}.desktop
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x ppc64
 
-Requires:       beryl-core >= %{version}
+Requires:       beryl-core >= %{version}, beryl-plugins >= %{version}
 
 BuildRequires:  beryl-core-devel >= %{version}
 BuildRequires:  gtk2-devel >= 2.8.0, gettext-devel
@@ -36,16 +35,31 @@
 manager.
 
 
+%package simple
+Summary:        Simplified beryl settings GUI
+Group:          User Interface/Desktops
+Requires:       %{name} = %{version}-%{release}
+
+
+%description simple
+A beryl settings configuration utility that takes
+a minimal, simplified approach to configuring beryl.
+
+
 %prep
 %setup -q -a 1 -a 2
 
 %build
-%configure
-make %{?_smp_mflags}
+# beryl-settings-bindings
 pushd beryl-settings-bindings-%{version}
 %configure
 make %{?_smp_mflags}
 popd
+# beryl-settings
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$RPM_BUILD_ROOT/beryl-settings-bindings-%{version}/
+%configure
+make %{?_smp_mflags}
+# beryl-settings-simple
 pushd beryl-settings-simple-%{version}
 %configure
 make %{?_smp_mflags}
@@ -62,11 +76,14 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 popd
 find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor fedora --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category X-Fedora %{name}.desktop
+desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora %{SOURCE3}
-# translations seem to have disappeared in 0.1.99.2...
-#find_lang %{name}
+  --add-category X-Fedora %{name}-simple-%{version}/%{name}-simple.desktop
+%find_lang %{name}
+%find_lang %{name}-simple
 
 
 %clean
@@ -83,28 +100,37 @@
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 
-#files -f %{name}.lang
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/beryl-settings
-%{_bindir}/beryl-settings-simple
 %{python_sitearch}/berylsettings.so
 %{_libdir}/pkgconfig/beryl-settings-bindings.pc
 %dir %{_datadir}/bsm
 %dir %{_datadir}/bsm/images
-%dir %{_datadir}/beryl-settings-simple
 %{_datadir}/bsm/images/*.svg
+%{_datadir}/icons/hicolor/scalable/apps/beryl-settings.svg
+%{_datadir}/applications/*beryl-settings.desktop
+# Man page went awol in 0.1.99.2...
+#{_mandir}/man1/beryl-settings.1.gz
+
+
+%files simple -f %{name}-simple.lang
+%defattr(-,root,root,-)
+%{_bindir}/beryl-settings-simple
+%dir %{_datadir}/beryl-settings-simple
 %{_datadir}/beryl-settings-simple/*.svg
 %{_datadir}/beryl-settings-simple/*.png
 %{_datadir}/beryl-settings-simple/*.Profile
-%{_datadir}/icons/hicolor/scalable/apps/beryl-settings.svg
-%{_datadir}/applications/*.desktop
-# Man page also went awol in 0.1.99.2...
-#{_mandir}/man1/beryl-settings.1.gz
+%{_datadir}/applications/*beryl-settings-simple.desktop
 
 
 %changelog
+* Mon Feb 05 2007 Jarod Wilson <jwilson at redhat.com> 0.1.9999.1-1
+- beryl 0.1.9999.1 (aka 0.2.0-rc1)
+- put beryl-settings-simple in its own package
+- R: beryl-plugins, or there's nothing to configure
+
 * Mon Jan 29 2007 Jarod Wilson <jwilson at redhat.com> 0.1.99.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jan 2007 21:38:49 -0000	1.5
+++ sources	5 Feb 2007 16:18:55 -0000	1.6
@@ -1,3 +1,3 @@
-268098ad5bb563d0c5abbbc3af81f00f  beryl-settings-0.1.99.2.tar.bz2
-84a1ad03e0ba5bfed8a80e7e15c00f7d  beryl-settings-bindings-0.1.99.2.tar.bz2
-5d94ca4f8e85fad68029a11fb7cc9cff  beryl-settings-simple-0.1.99.2.tar.bz2
+77d42004275638bbba38dd0abdbb3f95  beryl-settings-0.1.9999.1.tar.bz2
+b5d4b936c8ee43ed61f1125509ebe184  beryl-settings-bindings-0.1.9999.1.tar.bz2
+f34cfc2d55a7bd2c317f890262dde673  beryl-settings-simple-0.1.9999.1.tar.bz2