diff --git a/.cvsignore b/.cvsignore index dd1902a..363a32b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -avogadro-0.9.1.tar.bz2 +avogadro-0.9.2.tar.bz2 diff --git a/avogadro-icon.patch b/avogadro-icon.patch new file mode 100644 index 0000000..d0d3b68 --- /dev/null +++ b/avogadro-icon.patch @@ -0,0 +1,12 @@ +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; diff --git a/avogadro.spec b/avogadro.spec index b9d3256..8e8a99f 100644 --- a/avogadro.spec +++ b/avogadro.spec @@ -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 @@ Group: Applications/Editors 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 @@ Avogadros libraries. %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 @@ make %{?_smp_mflags} -C %{_target_platform} 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 @@ rm -rf $RPM_BUILD_ROOT %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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Mar 14 2009 Sebastian Dziallas 0.9.2-1 +- update to new release + * Wed Feb 25 2009 Sebastian Dziallas 0.9.1-1 - update to new release diff --git a/sources b/sources index c3b0523..f82683b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8dfa60d1c3f4718e9a9d8c996c7dd5e avogadro-0.9.1.tar.bz2 +f330fa6d06346ccfee0f28bb61bd0fd7 avogadro-0.9.2.tar.bz2