Packman Build Service PMBS

Changes of Revision 3

project.diff Changed

@@ -1,56 +1,6 @@
 --- conky.spec.orig
 +++ conky.spec
-@@ -25,37 +25,37 @@
- Name:           conky
- Version:        1.9.0
- Release:        0
--Summary:        Lightweight System Monitor
- License:        GPL-3.0+
-+Summary:        Lightweight System Monitor
-+Url:            http://conky.sourceforge.net
- Group:          System/Monitoring
- Source:         http://prdownloads.sourceforge.net/conky/conky-%{version}.tar.bz2
- Source1:        conky.desktop
- # PATCH-FIX - add -lm when linking against -liw
--Patch1: 	conky-1.9.0-libiw_with_libm.patch
-+Patch1:         conky-1.9.0-libiw_with_libm.patch
- Source99:       conky-rpmlintrc
--Url:            http://conky.sourceforge.net
--BuildRoot:      %{_tmppath}/%{name}-%{version}-build
- BuildRequires:  fontconfig-devel
- BuildRequires:  freetype2-devel
- BuildRequires:  gcc
- BuildRequires:  make
- BuildRequires:  xorg-x11-devel
-+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
- %if 0%{?suse_version} >= 1120
- BuildRequires:  libiw-devel
- %else
- BuildRequires:  wireless-tools
- %endif
--BuildRequires:  glib2-devel
--BuildRequires:  libpng-devel
--BuildRequires:  zlib-devel
--BuildRequires:  xorg-x11-devel
--BuildRequires:  cairo-devel
--BuildRequires:  update-desktop-files
-+BuildRequires:  alsa-devel
- BuildRequires:  autoconf
- BuildRequires:  automake
--BuildRequires:  libtool
- BuildRequires:  docbook2x
--BuildRequires:  alsa-devel
-+BuildRequires:  libpng-devel
-+BuildRequires:  libtool
-+BuildRequires:  update-desktop-files
-+BuildRequires:  xorg-x11-devel
-+BuildRequires:  zlib-devel
-+BuildRequires:  pkgconfig(cairo)
-+BuildRequires:  pkgconfig(glib-2.0)
- %if %with_lua_extra
- BuildRequires:  tolua++
- %endif
-@@ -63,8 +63,8 @@ BuildRequires:  tolua++
+@@ -70,8 +70,8 @@ BuildRequires:  tolua++
  %define with_imlib2 1
  BuildRequires:  imlib2-devel
  %endif
@@ -60,142 +10,3 @@
  %if 0%{?suse_version} >= 1020
  %define with_lua 1
  %if 0%{?suse_version} >= 1220
-@@ -82,14 +82,17 @@ BuildRequires:  vim
- %else
- BuildRequires:  vim
- %endif
--%if %suse_version >= 1030
-+%if 0%{?suse_version} >= 1030
- BuildRequires:  libcurl-devel
- %else
- BuildRequires:  curl-devel
- %endif
- %if 0%{?packman_bs}
- BuildRequires:  audacious-devel
-+# fix dbus-glib-1 no found for audacious
-+BuildRequires:	dbus-1-glib-devel
- BuildRequires:  libXNVCtrl
-+BuildRequires:  xmms2-devel
- %endif
- 
- %description
-@@ -158,7 +161,7 @@ configuration files in nano.
- %package feature-audacious
- Summary:        Pseudo Package for %{name} with Audacious Support
- Group:          System/Monitoring
--Requires:       %{name} = %{version}-%{release}
-+Requires:       %{name} = %{version}
- 
- %description feature-audacious
- This is a pseudo-package that doesn't contain any files but
-@@ -168,7 +171,7 @@ for the Audacious player.
- %package feature-nvidia
- Summary:        Pseudo Package for %{name} with nVidia Support
- Group:          System/Monitoring
--Requires:       %{name} = %{version}-%{release}
-+Requires:       %{name} = %{version}
- 
- %description feature-nvidia
- This is a pseudo-package that doesn't contain any files but
-@@ -179,12 +182,12 @@ for nVidia GPU statistics.
- %prep
- %setup -q
- 
--%patch1  
-+%patch1
- 
- for i in AUTHORS ChangeLog; do
--    %__mv "${i}" "${i}.orig" && \
-+    mv "${i}" "${i}.orig" && \
-     iconv -f iso8859-1 -t utf8 -o "${i}" "${i}.orig" && \
--    %__rm "${i}.orig"
-+    rm "${i}.orig"
- done
- 
- %build
-@@ -203,6 +206,9 @@ LDFLAGS="-lm" \
-     --enable-x11 \
-     --enable-xdamage \
-     --enable-portmon \
-+    --enable-ibm \
-+    --enable-weather-metar \
-+    --enable-weather-xoap \
-     --enable-rss \
-     --enable-eve \
-     --%{?with_imlib2:enable}%{!?with_imlib2:disable}-imlib2 \
-@@ -221,7 +227,8 @@ LDFLAGS="-lm" \
-     --enable-wlan \
- %if 0%{?packman_bs}
-     --enable-audacious=yes \
--    --enable-nvidia=yes
-+    --enable-nvidia=yes \
-+    --enable-xmms2=yes
- %else
-     --enable-audacious=no \
-     --enable-nvidia=no
-@@ -229,16 +236,16 @@ LDFLAGS="-lm" \
- 
- # inotify on SLE < 11 is too old
- %if 0%{?sles_version} > 0 && 0%{?sles_version} < 11
--%__sed -i '/^#define HAVE_SYS_INOTIFY_H/d' src/config.h
-+sed -i '/^#define HAVE_SYS_INOTIFY_H/d' src/config.h
- echo '#undef HAVE_SYS_INOTIFY_H' >> src/config.h
- %endif
- 
--%__make %{?jobs:-j%{jobs}}
-+make %{?_smp_mflags}
- 
- %install
--%makeinstall
-+%make_install
- 
--%__install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
-+install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
- %suse_update_desktop_file -r "%{name}" System Monitor
- 
- for feature in audacious nvidia; do
-@@ -250,35 +257,35 @@ from a different repository.
- EOF
- done
- 
--%__install -D -m0644 extras/vim/ftdetect/conkyrc.vim "%{buildroot}%{_datadir}/vim/site/ftdetect/conkyrc.vim"
--%__install -D -m0644 extras/vim/syntax/conkyrc.vim   "%{buildroot}%{_datadir}/vim/site/syntax/conkyrc.vim"
-+install -D -m0644 extras/vim/ftdetect/conkyrc.vim "%{buildroot}%{_datadir}/vim/site/ftdetect/conkyrc.vim"
-+install -D -m0644 extras/vim/syntax/conkyrc.vim   "%{buildroot}%{_datadir}/vim/site/syntax/conkyrc.vim"
- 
--%__install -D -m0644 extras/nano/conky.nanorc "%{buildroot}%{_datadir}/nano/conky.nanorc"
-+install -D -m0644 extras/nano/conky.nanorc "%{buildroot}%{_datadir}/nano/conky.nanorc"
- 
--%__install -d "%{buildroot}%{_docdir}/%{name}"
-+install -d "%{buildroot}%{_docdir}/%{name}"
- MAINDOCFILES="$PWD/doc.main.lst"
- echo -n >"$MAINDOCFILES"
- for f in AUTHORS ChangeLog COPYING NEWS README TODO data/conky.conf; do
-     ff=$(basename "$f")
--    %__install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$ff"
-+    install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$ff"
-     echo "%doc %{_docdir}/%{name}/$ff" >>"$MAINDOCFILES"
- done
- DOCDOCFILES="$PWD/doc.doc.lst"
- echo -n >"$DOCDOCFILES"
- for f in doc/*.html; do
-     ff=$(basename "$f")
--    %__install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$ff"
-+    install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$ff"
-     echo "%doc %{_docdir}/%{name}/$ff" >>"$DOCDOCFILES"
- done
- 
- %if %with_lua_extra
--%__rm -rf "%{buildroot}%{_libdir}/conky"/*.{a,la}
-+rm -rf "%{buildroot}%{_libdir}/conky"/*.{a,la}
- %else
--%__install -d "%{buildroot}%{_libdir}/conky"
-+install -d "%{buildroot}%{_libdir}/conky"
- %endif
- 
- %clean
--%{?buildroot:%__rm -rf "%{buildroot}"}
-+%{?buildroot:rm -rf %{buildroot}}
- 
- %files -f doc.main.lst
- %defattr(-,root,root)

_link Changed