rpms/beryl-settings/FC-6 beryl-settings.desktop, NONE, 1.1 .cvsignore, 1.4, 1.5 beryl-settings.spec, 1.3, 1.4 sources, 1.4, 1.5

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	.cvsignore beryl-settings.spec sources 
Added Files:
	beryl-settings.desktop 
Log Message:
New upstream release 0.1.99.2


--- NEW FILE beryl-settings.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Beryl Settings Manager
Comment=Configure beryl
Icon=/usr/share/icons/hicolor/scalable/apps/beryl-settings.svg
Exec=beryl-settings
Terminal=false
Type=Application
Categories=Settings;X-Fedora;
X-Desktop-File-Install-Version=0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jan 2007 16:05:45 -0000	1.4
+++ .cvsignore	29 Jan 2007 21:38:49 -0000	1.5
@@ -1,3 +1,6 @@
 beryl-settings-0.1.2.tar.bz2
 beryl-settings-0.1.3.tar.bz2
 beryl-settings-0.1.4.tar.bz2
+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


Index: beryl-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/FC-6/beryl-settings.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beryl-settings.spec	3 Jan 2007 16:05:45 -0000	1.3
+++ beryl-settings.spec	29 Jan 2007 21:38:49 -0000	1.4
@@ -2,12 +2,15 @@
 Url:            http://www.beryl-project.org/
 License:        GPL
 Group:          User Interface/Desktops
-Version:        0.1.4
+Version:        0.1.99.2
 Release:        1%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager GUI config utility
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 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
@@ -16,8 +19,10 @@
 
 BuildRequires:  beryl-core-devel >= %{version}
 BuildRequires:  gtk2-devel >= 2.8.0, gettext-devel
+BuildRequires:  pygtk2-devel, Pyrex, python-devel >= 2.3
 BuildRequires:  perl-XML-Parser, desktop-file-utils
 
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')}
 
 %description
 Beryl is a combined window manager and compositing
@@ -32,23 +37,36 @@
 
 
 %prep
-%setup -q
-perl -pi -e 's/png/svg/g' misc/beryl-settings.desktop
+%setup -q -a 1 -a 2
 
 %build
 %configure
 make %{?_smp_mflags}
+pushd beryl-settings-bindings-%{version}
+%configure
+make %{?_smp_mflags}
+popd
+pushd beryl-settings-simple-%{version}
+%configure
+make %{?_smp_mflags}
+popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+pushd beryl-settings-bindings-%{version}
+make DESTDIR=$RPM_BUILD_ROOT install
+popd
+pushd beryl-settings-simple-%{version}
+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 --delete-original \
+desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  $RPM_BUILD_ROOT%{_datadir}/applications/beryl-settings.desktop
-%find_lang %{name}
+  --add-category X-Fedora %{SOURCE3}
+# translations seem to have disappeared in 0.1.99.2...
+#find_lang %{name}
 
 
 %clean
@@ -65,16 +83,31 @@
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 
-%files -f %{name}.lang
+#files -f %{name}.lang
+%files
 %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}/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
-%{_datadir}/pixmaps/*.svg
-%{_mandir}/man1/beryl-settings.1.gz
+# Man page also went awol in 0.1.99.2...
+#{_mandir}/man1/beryl-settings.1.gz
 
 
 %changelog
+* Mon Jan 29 2007 Jarod Wilson <jwilson at redhat.com> 0.1.99.2-1
+- New upstream release
+
 * Tue Jan 02 2007 Jarod Wilson <jwilson at redhat.com> 0.1.4-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Jan 2007 16:05:45 -0000	1.4
+++ sources	29 Jan 2007 21:38:49 -0000	1.5
@@ -1 +1,3 @@
-527c6cf2a91d7249b409f123602709f6  beryl-settings-0.1.4.tar.bz2
+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