Hello community,

here is the log from the commit of package weechat for openSUSE:Factory checked 
in at 2014-06-30 22:50:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/weechat (Old)
 and      /work/SRC/openSUSE:Factory/.weechat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "weechat"

Changes:
--------
--- /work/SRC/openSUSE:Factory/weechat/weechat.changes  2014-05-27 
12:03:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.weechat.new/weechat.changes     2014-06-30 
22:50:38.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jun 23 09:24:24 UTC 2014 - tchva...@suse.com
+
+- Make the thing build again on SLE11 as we use it in SUSE on
+  server :)
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ weechat.spec ++++++
--- /var/tmp/diff_new_pack.H9VwZA/_old  2014-06-30 22:50:39.000000000 +0200
+++ /var/tmp/diff_new_pack.H9VwZA/_new  2014-06-30 22:50:39.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package weechat
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,40 +22,47 @@
 Summary:        Portable, Fast, Light and Extensible Chat Client
 License:        GPL-3.0+
 Group:          Productivity/Networking/IRC
+Url:            http://www.weechat.org
 Source:         http://www.weechat.org/files/src/weechat-%{version}.tar.bz2
 Source1:        weechat.desktop
 # PATCH-FIX-UPSTREAM weechat-capath.patch 
https://savannah.nongnu.org/patch/index.php?8153 lnus...@suse.de -- use 
system's default certificate store
 Patch0:         weechat-capath.patch
 # PATCH-FIX-UPSTREAM weechat-link-pthread.patch 
https://bugs.gentoo.org/show_bug.cgi?id=501078 g...@opensuse.org -- Link 
Weechat against libpthread
 Patch1:         weechat-link-pthread.patch
-Url:            http://www.weechat.org
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  curl-devel
 BuildRequires:  gcc-c++
 BuildRequires:  grep
+BuildRequires:  guile-devel
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  libgcrypt-devel
+BuildRequires:  libgnutls-devel
+BuildRequires:  libgpg-error-devel
 BuildRequires:  libtool
+BuildRequires:  lzo-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  perl
 BuildRequires:  pkg-config
 BuildRequires:  python-devel
-BuildRequires:  lua51-devel
-BuildRequires:  ruby-devel
-BuildRequires:  libgnutls-devel
-BuildRequires:  enchant-devel
-BuildRequires:  guile-devel
-BuildRequires:  libgcrypt-devel
-BuildRequires:  libgpg-error-devel
-BuildRequires:  lzo-devel
 BuildRequires:  ruby-devel
 BuildRequires:  tcl-devel
+BuildRequires:  update-desktop-files
+Requires:       hicolor-icon-theme
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1220
+BuildRequires:  enchant-devel
+%endif
+%if 0%{?suse_version} > 1220
+BuildRequires:  lua51-devel
+%else
+BuildRequires:  lua-devel
+%endif
+%if 0%{?suse_version} > 1220
 BuildRequires:  asciidoc
-BuildRequires:  source-highlight
 BuildRequires:  docbook5-xsl-stylesheets
 BuildRequires:  libxslt-tools
-BuildRequires:  update-desktop-files
-BuildRequires:  hicolor-icon-theme
-Requires:       hicolor-icon-theme
+BuildRequires:  source-highlight
+%endif
 
 %description
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light cross-platform
@@ -73,6 +80,8 @@
 %description devel
 Development environment for authoring %{name} plugins.
 
+%if 0%{?suse_version} > 1220
+
 %package guile
 Summary:        Guile Scripting Support for %{name}
 Group:          Productivity/Networking/IRC
@@ -80,6 +89,7 @@
 
 %description guile
 Support for %{name} scripts written in the Guile language.
+%endif
 
 %package lua
 Summary:        Lua Scripting Support for %{name}
@@ -122,6 +132,8 @@
 %description ruby
 Support for %{name} scripts written in the Ruby language.
 
+%if 0%{?suse_version} > 1220
+
 %package aspell
 Summary:        Aspell Spell-Checking Support for %{name}
 Group:          Productivity/Networking/IRC
@@ -129,6 +141,7 @@
 
 %description aspell
 Spell-checking support for %{name}, using the aspell library.
+%endif
 
 %prep
 %setup -q
@@ -157,7 +170,7 @@
 
 %install
 pushd build
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 popd #build
 
 # due to an unknown race condition cmake does not always create a compatibility
@@ -169,10 +182,14 @@
 %suse_update_desktop_file -r "%{name}" Network IRCClient
 %endif
 
+%if 0%{?suse_version} > 1220
 mv "%{buildroot}%{_datadir}/doc/weechat" html
+%endif
 
 %find_lang "%{name}" --with-man
 
+%if 0%{?suse_version} > 1220
+
 %post
 %desktop_database_post
 %icon_theme_cache_post
@@ -180,10 +197,14 @@
 %postun
 %desktop_database_postun
 %icon_theme_cache_postun
+%endif
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README html/
+%doc AUTHORS ChangeLog COPYING NEWS README
+%if 0%{?suse_version} > 1220
+%doc html/
+%endif
 %{_bindir}/weechat-curses
 %{_bindir}/weechat
 %dir %{_libdir}/weechat
@@ -197,20 +218,26 @@
 %{_libdir}/weechat/plugins/rmodifier.so
 %{_libdir}/weechat/plugins/script.so
 %{_libdir}/weechat/plugins/xfer.so
+%if 0%{?suse_version} > 1220
 %{_mandir}/man1/weechat.1*
+%endif
 %{_datadir}/applications/weechat.desktop
 %{_datadir}/icons/hicolor/*/apps/weechat.png
 
 %files -f "%{name}.lang" lang
+%defattr(-,root,root)
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/weechat
 %{_libdir}/pkgconfig/weechat.pc
 
+%if 0%{?suse_version} > 1220
+
 %files guile
 %defattr(-,root,root)
 %{_libdir}/weechat/plugins/guile.so
+%endif
 
 %files lua
 %defattr(-,root,root)
@@ -232,8 +259,11 @@
 %defattr(-,root,root)
 %{_libdir}/weechat/plugins/ruby.so
 
+%if 0%{?suse_version} > 1220
+
 %files aspell
 %defattr(-,root,root)
 %{_libdir}/weechat/plugins/aspell.so
+%endif
 
 %changelog

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to