rpms/avogadro/devel avogadro-icon.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 avogadro.spec, 1.4, 1.5 sources, 1.4, 1.5

[Sebastian Dziallas]

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10367

Modified Files:
	.cvsignore avogadro.spec sources 
Added Files:
	avogadro-icon.patch 
Log Message:
update to new release and add icon patch


avogadro-icon.patch:

--- NEW FILE avogadro-icon.patch ---
diff -uNr a/avogadro/src/avogadro.desktop b/avogadro/src/avogadro.desktop
--- a/avogadro/src/avogadro.desktop	2009-03-01 19:00:55.000000000 +0100
+++ b/avogadro/src/avogadro.desktop	2009-03-16 23:05:02.000000000 +0100
@@ -4,7 +4,7 @@
 Name=Avogadro
 Comment=Advanced molecular editor
 Exec=avogadro %f
-Icon=avogadro-icon
+Icon=avogadro_icon
 Terminal=false
 Type=Application
 Categories=Qt;Science;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Feb 2009 18:57:40 -0000	1.4
+++ .cvsignore	16 Mar 2009 22:32:31 -0000	1.5
@@ -1 +1 @@
-avogadro-0.9.1.tar.bz2
+avogadro-0.9.2.tar.bz2


Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/avogadro.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- avogadro.spec	25 Feb 2009 18:57:40 -0000	1.4
+++ avogadro.spec	16 Mar 2009 22:32:31 -0000	1.5
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           avogadro
-Version:        0.9.1
+Version:        0.9.2
 Release:        1%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
@@ -10,7 +10,7 @@
 License:        GPLv2
 URL:            http://avogadro.openmolecules.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source1:        %{name}.desktop
+Patch0:         %{name}-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake >= 2.6.0
@@ -54,12 +54,13 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} %{?BUILD_TESTS} -DCMAKE_BUILD_TYPE=Release -DENABLE_GLSL=ON -DENABLE_PYTHON=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_lib} ..
+%{cmake} %{?BUILD_TESTS} -DCMAKE_BUILD_TYPE=Release -DENABLE_GLSL=ON -DENABLE_PYTHON=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} ..
 popd
 make %{?_smp_mflags} -C %{_target_platform}
 
@@ -68,9 +69,6 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
-# app icon
-install -p -D -m644 ./avogadro/src/icons/avogadro.svg $RPM_BUILD_ROOT/%{_datadir}/pixmaps/avogadro.svg
-
 # system menu entry
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor=""                 \
@@ -92,14 +90,14 @@
 %doc AUTHORS ChangeLog COPYING
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/pixmaps/%{name}.svg
+%{_datadir}/pixmaps/%{name}_icon.png
 %{_datadir}/applications/%{name}.desktop
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_datadir}/libavogadro
-%{_includedir}/%{name}
+%{_includedir}/*.h
 %{_libdir}/*.so
 
 
@@ -111,6 +109,9 @@
 
 
 %changelog
+* Sat Mar 14 2009 Sebastian Dziallas <sebastian at when.com> 0.9.2-1
+- update to new release
+
 * Wed Feb 25 2009 Sebastian Dziallas <sebastian at when.com> 0.9.1-1
 - update to new release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Feb 2009 18:57:40 -0000	1.4
+++ sources	16 Mar 2009 22:32:31 -0000	1.5
@@ -1 +1 @@
-a8dfa60d1c3f4718e9a9d8c996c7dd5e  avogadro-0.9.1.tar.bz2
+f330fa6d06346ccfee0f28bb61bd0fd7  avogadro-0.9.2.tar.bz2