Mailinglist Archive: opensuse-commit (1855 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package avogadro for openSUSE:Factory
checked in at Fri Sep 2 13:03:35 CEST 2011.



--------
--- avogadro/avogadro.changes   2011-06-06 12:45:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/avogadro/avogadro.changes      2011-08-08 
10:45:15.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug  8 10:34:25 UTC 2011 - toddrme2178@xxxxxxxxxx
+  
+- Added check for duplicate files (fix for RPMLINT warning)
+- Removed name from summary (fix for RPMLINT warning)
+- Cleaned up spec file formatting
+ 
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ avogadro.spec ++++++
--- /var/tmp/diff_new_pack.kDLVUZ/_old  2011-09-02 13:02:59.000000000 +0200
+++ /var/tmp/diff_new_pack.kDLVUZ/_new  2011-09-02 13:02:59.000000000 +0200
@@ -15,27 +15,38 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           avogadro
 Version:        1.0.3
-Release:        1
+Release:        3
 License:        GPLv2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       libavogadro1 = %{version}
-Requires:       python-numpy python-sip
-Requires:       openbabel
-BuildRequires:  docbook-utils glew-devel xorg-x11-devel
-BuildRequires:  boost-devel python-numpy-devel python-sip-devel
-BuildRequires:  gcc-c++ libopenbabel-devel >= 2.2.3 python-qt4-devel
-BuildRequires:  cmake libeigen2-devel libqt4-devel >= 4.5.1 python-devel
-BuildRequires:  xorg-x11-libX11-devel xorg-x11-libXext-devel
-Group:          Productivity/Editors/Other
-Summary:        Avogadro is a Molecular design tool
+Summary:        A Molecular design tool
 Url:            http://avogadro.sourceforge.net/wiki/Main_Page
+Group:          Productivity/Editors/Other
 Source0:        
http://mesh.dl.sourceforge.net/sourceforge/avogadro/%{name}-%{version}.tar.bz2
-Source1:        %name.png
+Source1:        %{name}.png
+BuildRequires:  boost-devel
+BuildRequires:  cmake
+BuildRequires:  docbook-utils
+BuildRequires:  fdupes
+BuildRequires:  gcc-c++
+BuildRequires:  glew-devel
+BuildRequires:  libeigen2-devel
+BuildRequires:  libopenbabel-devel >= 2.2.3
+BuildRequires:  libqt4-devel >= 4.5.1
+BuildRequires:  python-devel
+BuildRequires:  python-numpy-devel
+BuildRequires:  python-qt4-devel
+BuildRequires:  python-sip-devel
+BuildRequires:  xorg-x11-devel
+BuildRequires:  xorg-x11-libX11-devel
+BuildRequires:  xorg-x11-libXext-devel
+Requires:       libavogadro1 = %{version}
+Requires:       openbabel
+Requires:       python-numpy
+Requires:       python-sip
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{py_requires}
 
 %description
@@ -47,7 +58,7 @@
 
 %package -n libavogadro1
 License:        GPLv2
-Summary:        Avogadro is a Molecular design tool
+Summary:        A Molecular design tool
 Group:          Development/Libraries/C and C++
 Provides:       libavogadro
 
@@ -64,7 +75,7 @@
 License:        GPLv2
 Summary:        Development files for Avogadro 
 Group:          Development/Libraries/C and C++
-Requires:       %name = %version
+Requires:       %{name} = %{version}
 
 %description devel
 This package contains files to develop applications using 
@@ -88,23 +99,23 @@
        -DENABLE_PYTHON=ON \
         ..
 
-%{__make} %{?jobs:-j %jobs}
+make %{?_smp_mflags}
 
 %install
 cd build
-%makeinstall
+%make_install
 
 mkdir -p %{buildroot}/%{_datadir}/qt4/mkspecs/
-mv %{buildroot}/usr/features %{buildroot}/%{_datadir}/qt4/mkspecs/
+mv %{buildroot}%{_prefix}/features %{buildroot}/%{_datadir}/qt4/mkspecs/
 # Create the system menu entry
 mkdir -p %{buildroot}%{_datadir}/applications
-cat > %{buildroot}%{_datadir}/applications/%name.desktop << EOF
+cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
 [Desktop Entry]
 Name=Avogadro
 Comment=%{summary}
 GenericName=Avogadro
-Exec=%name
-Icon=%name
+Exec=%{name}
+Icon=%{name}
 Terminal=0
 Categories=KDE;Education;Chemistry;
 Type=Application
@@ -112,34 +123,34 @@
 EOF
 
 # icon
-install -D -m644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%name.png
+install -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 %ifarch x86_64
-       mkdir -p %{buildroot}/%{python_sitelib}
-       find %{buildroot} -name 'Avogadro.so' | xargs mv -t 
%{buildroot}/%{python_sitelib}/
-       find %{buildroot}/%{_lib} -name "python*" |xargs rm -rf
+       mkdir -p %{buildroot}%{python_sitelib}
+       find %{buildroot} -name 'Avogadro.so' | xargs mv -t 
%{buildroot}%{python_sitelib}/
+       find %{buildroot}%{_lib} -name "python*" |xargs rm -rf
 %endif
+%fdupes %{buildroot}%{_datadir}/libavogadro/shaders/
+%fdupes %{buildroot}%{_datadir}/avogadro/i18n/
 
 %post -n libavogadro1 -p /sbin/ldconfig
 
 %postun -n libavogadro1 -p /sbin/ldconfig
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
-%doc %{_mandir}/man1/avogadro.1.gz
-%doc %{_mandir}/man1/avopkg.1.gz
+%{_mandir}/man1/avogadro.1.gz
+%{_mandir}/man1/avopkg.1.gz
 %{_bindir}/avogadro
 %{_bindir}/avopkg
 %dir %{_datadir}/libavogadro
-%dir %{_datadir}/libavogadro/shaders
-%{_datadir}/libavogadro/shaders/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/libavogadro/shaders/
+%{_datadir}/%{name}/
 %{_datadir}/pixmaps/*.png
-%{_datadir}/applications/%name.desktop
+%{_datadir}/applications/%{name}.desktop
 #plugins not libraries
 %dir %{_libdir}/avogadro
 %dir %{_libdir}/avogadro/1_0



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx