[svn] r5237 - in trunk/rpms: . effectv gnome-applet-sensors
libnetfilter_conntrack libnfnetlink xmms xorp xosd
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Fri Mar 23 11:16:40 CET 2007
Author: dag
Date: 2007-03-23 11:16:38 +0100 (Fri, 23 Mar 2007)
New Revision: 5237
Added:
trunk/rpms/effectv/effectv-0.3.11-gcc4.patch
trunk/rpms/gnome-applet-netspeed/
trunk/rpms/gnome-applet-sensors/
trunk/rpms/gnome-applet-sensors/gnome-applet-sensors-1.5.spec
trunk/rpms/gnome-applet-sensors/gnome-applet-sensors.spec
trunk/rpms/libnetfilter_conntrack/
trunk/rpms/libnetfilter_conntrack/libnetfilter_conntrack.spec
trunk/rpms/libnfnetlink/
trunk/rpms/libnfnetlink/libnfnetlink.spec
Removed:
trunk/rpms/netspeed_applet/
trunk/rpms/timer-applet/
Modified:
trunk/rpms/xmms/xmms.spec
trunk/rpms/xorp/xorp.spec
trunk/rpms/xosd/xosd.spec
Log:
Updates
Added: trunk/rpms/effectv/effectv-0.3.11-gcc4.patch
===================================================================
--- trunk/rpms/effectv/effectv-0.3.11-gcc4.patch (rev 0)
+++ trunk/rpms/effectv/effectv-0.3.11-gcc4.patch 2007-03-23 10:16:38 UTC (rev 5237)
@@ -0,0 +1,25 @@
+diff -ur effectv-0.3.11/utils.c effectv-0.3.11.phh/utils.c
+--- effectv-0.3.11/utils.c 2006-02-14 15:06:17.000000000 +0100
++++ effectv-0.3.11.phh/utils.c 2006-07-04 12:07:24.623118250 +0200
+@@ -26,7 +26,7 @@
+ /*
+ * HSI color system utilities
+ */
+-static int trunc(double f)
++static int HSItrunc(double f)
+ {
+ int i;
+
+@@ -44,9 +44,9 @@
+ Gv=1+S*sin(H);
+ Bv=1+S*sin(H+2*M_PI/3);
+ T=255.999*I/2;
+- *r=trunc(Rv*T);
+- *g=trunc(Gv*T);
+- *b=trunc(Bv*T);
++ *r=HSItrunc(Rv*T);
++ *g=HSItrunc(Gv*T);
++ *b=HSItrunc(Bv*T);
+ }
+
+ /*
Copied: trunk/rpms/gnome-applet-netspeed (from rev 5234, trunk/rpms/netspeed_applet)
Added: trunk/rpms/gnome-applet-sensors/gnome-applet-sensors-1.5.spec
===================================================================
--- trunk/rpms/gnome-applet-sensors/gnome-applet-sensors-1.5.spec (rev 0)
+++ trunk/rpms/gnome-applet-sensors/gnome-applet-sensors-1.5.spec 2007-03-23 10:16:38 UTC (rev 5237)
@@ -0,0 +1,53 @@
+# $Id$
+# Authority: dag
+
+%define real_name sensors-applet
+
+Summary: Gnome panel applet for hardware sensors
+Name: gnome-applet-sensors
+Version: 1.5.2
+Release: 1
+License: GPL
+Group: User Interface/Desktops
+URL: http://sensors-applet.sourceforge.net/
+
+Source: http://dl.sf.net/sourceforge/sensors-applet/sensors-applet-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: gettext
+BuildRequires: gnome-panel-devel >= 2.8
+
+Provides: %{real_name} = %{version}-%{release}
+Obsoletes: %{real_name} <= %{version}-%{release}
+
+%description
+GNOME Sensors Applet is an applet for the GNOME Panel to display readings
+from hardware sensors, including CPU and system temperatures, fan speeds
+and voltage readings under Linux.
+
+%prep
+%setup -n %{real_name}-%{version}
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+%find_lang %{real_name}
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files -f %{real_name}.lang
+%defattr(-, root, root, 0755)
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%{_datadir}/gnome-2.0/ui/SensorsApplet.xml
+%{_datadir}/pixmaps/sensors-applet-icon.png
+%{_libdir}/bonobo/servers/SensorsApplet.server
+%{_libexecdir}/sensors-applet
+
+%changelog
+* Thu Mar 22 2007 Dag Wieers <dag at wieers.com> - 1.5.2-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/gnome-applet-sensors/gnome-applet-sensors-1.5.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: trunk/rpms/gnome-applet-sensors/gnome-applet-sensors.spec
===================================================================
--- trunk/rpms/gnome-applet-sensors/gnome-applet-sensors.spec (rev 0)
+++ trunk/rpms/gnome-applet-sensors/gnome-applet-sensors.spec 2007-03-23 10:16:38 UTC (rev 5237)
@@ -0,0 +1,70 @@
+# $Id$
+# Authority: dag
+
+%define real_name sensors-applet
+
+Summary: Gnome panel applet for hardware sensors
+Name: gnome-applet-sensors
+Version: 1.7.10
+Release: 1
+License: GPL
+Group: User Interface/Desktops
+URL: http://sensors-applet.sourceforge.net/
+
+Source: http://dl.sf.net/sourceforge/sensors-applet/sensors-applet-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: gettext, gnome-doc-utils, intltool, perl-XML-Parser, scrollkeeper
+BuildRequires: lm_sensors-devel, libnotify-devel
+BuildRequires: glib2-devel >= 2.6, gnome-panel-devel >= 2.8
+Requires: scrollkeeper
+Requires: scrollkeeper
+
+Provides: %{real_name} = %{version}-%{release}
+Obsoletes: %{real_name} <= %{version}-%{release}
+
+%description
+GNOME Sensors Applet is an applet for the GNOME Panel to display readings
+from hardware sensors, including CPU and system temperatures, fan speeds
+and voltage readings under Linux.
+
+%prep
+%setup -n %{real_name}-%{version}
+
+%build
+%configure \
+ --disable-scrollkeeper \
+ --enable-libnotify
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+%find_lang %{real_name}
+
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+scrollkeeper-update -q -o %{_datadir}/omf/sensors-applet/ || :
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+scrollkeeper-update -q || :
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files -f %{real_name}.lang
+%defattr(-, root, root, 0755)
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc %{_datadir}/gnome/help/sensors-applet/
+%{_datadir}/gnome-2.0/ui/SensorsApplet.xml
+%{_datadir}/icons/hicolor/*/apps/sensors-applet.png
+%{_datadir}/icons/hicolor/*/devices/sensors-applet*.png
+%{_datadir}/omf/sensors-applet/
+%{_datadir}/pixmaps/sensors-applet/
+%{_libdir}/bonobo/servers/SensorsApplet.server
+%{_libexecdir}/sensors-applet
+
+%changelog
+* Thu Mar 22 2007 Dag Wieers <dag at wieers.com> - 1.7.10-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/gnome-applet-sensors/gnome-applet-sensors.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: trunk/rpms/libnetfilter_conntrack/libnetfilter_conntrack.spec
===================================================================
--- trunk/rpms/libnetfilter_conntrack/libnetfilter_conntrack.spec (rev 0)
+++ trunk/rpms/libnetfilter_conntrack/libnetfilter_conntrack.spec 2007-03-23 10:16:38 UTC (rev 5237)
@@ -0,0 +1,70 @@
+# $Id$
+# Authority: dag
+
+Summary: Netfilter conntrack userspace library
+Name: libnetfilter_conntrack
+Version: 0.0.50
+Release: 1
+License: GPL
+Group: System Environment/Libraries
+URL: http://netfilter.org/
+
+Source: http://netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: libnfnetlink-devel, pkgconfig
+
+%description
+libnetfilter_conntrack is a userspace library providing a programming
+interface (API) to the in-kernel connection tracking state table.
+
+%package devel
+Summary: Header files, libraries and development documentation for %{name}.
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: libnfnetlink-devel
+
+%description devel
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%prep
+%setup
+
+%build
+%configure \
+ --disable-rpath \
+ --disable-static
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-, root, root, 0755)
+%doc COPYING
+%{_bindir}/ctnl_test
+%{_bindir}/new_api_test
+%{_libdir}/libnetfilter_conntrack.so.*
+%{_libdir}/libnetfilter_conntrack/nfct_*.so
+
+%files devel
+%defattr(-, root, root, 0755)
+%{_includedir}/libnetfilter_conntrack/libnetfilter_conntrack*.h
+%{_includedir}/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
+%{_libdir}/libnetfilter_conntrack.so
+%exclude %{_libdir}/libnetfilter_conntrack.la
+%{_libdir}/pkgconfig/libnetfilter_conntrack.pc
+%exclude %{_libdir}/libnetfilter_conntrack/nfct_*.la
+
+%changelog
+* Thu Mar 22 2007 Dag Wieers <dag at wieers.com> - 0.0.50-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/libnetfilter_conntrack/libnetfilter_conntrack.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: trunk/rpms/libnfnetlink/libnfnetlink.spec
===================================================================
--- trunk/rpms/libnfnetlink/libnfnetlink.spec (rev 0)
+++ trunk/rpms/libnfnetlink/libnfnetlink.spec 2007-03-23 10:16:38 UTC (rev 5237)
@@ -0,0 +1,63 @@
+# $Id$
+# Authority: dag
+
+Summary: Netfilter netlink userspace library
+Name: libnfnetlink
+Version: 0.0.25
+Release: 1
+License: GPL
+Group: System Environment/Libraries
+URL: http://netfilter.org/
+
+Source: http://netfilter.org/projects/libnfnetlink/files/libnfnetlink-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+libnfnetlink is a userspace library that provides some low-level
+nfnetlink handling functions. It is used as a foundation for other, netfilter
+subsystem specific libraries such as libnfnetlink_conntrack, libnfnetlink_log
+and libnfnetlink_queue.
+
+%package devel
+Summary: Header files, libraries and development documentation for %{name}.
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%prep
+%setup
+
+%build
+%configure --disable-static
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-, root, root, 0755)
+%doc README
+%{_libdir}/libnfnetlink.so.*
+
+%files devel
+%defattr(-, root, root, 0755)
+%{_includedir}/libnfnetlink/libnfnetlink.h
+%{_includedir}/libnfnetlink/linux_nfnetlink.h
+%exclude %{_libdir}/libnfnetlink.la
+%{_libdir}/libnfnetlink.so
+%{_libdir}/pkgconfig/libnfnetlink.pc
+
+%changelog
+* Thu Mar 22 2007 Dag Wieers <dag at wieers.com> - 0.0.25-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/libnfnetlink/libnfnetlink.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/xmms/xmms.spec
===================================================================
--- trunk/rpms/xmms/xmms.spec 2007-03-21 22:18:42 UTC (rev 5236)
+++ trunk/rpms/xmms/xmms.spec 2007-03-23 10:16:38 UTC (rev 5237)
@@ -3,6 +3,8 @@
%{?dist: %{expand: %%define %dist 1}}
+%{?el5:%define _without_arts 1}
+
%{?fc2:%define _without_mikmod 1}
%{?fc1:%define _without_alsa 1}
@@ -47,7 +49,7 @@
Patch1: xmms-1.2.6-audio.patch
Patch2: xmms-1.2.6-lazy.patch
Patch3: xmms-1.2.8-default-skin.patch
-Patch4: xmms-1.2.9-nomp3.patch
+#Patch4: xmms-1.2.9-nomp3.patch
Patch5: xmms-1.2.8-arts.patch
Patch6: xmms-1.2.8-alsalib.patch
Patch7: xmms-cd-mountpoint.patch
@@ -129,7 +131,7 @@
# Change the default skin
%patch3 -p1 -b .default-skin
# Don't build MP3 support, support bits for MP3 placeholder
-%patch4 -p1 -b .nomp3
+#patch4 -p1 -b .nomp3
# Link arts dynamically and detect its presence for choosing output plugin
%patch5 -p1 -b .arts
# Don't link *everything* against alsa-lib
@@ -151,26 +153,30 @@
%patch14 -p1
%patch15 -p1
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure
+
%build
%configure \
- --enable-kanji \
- --enable-texthack \
-%if %{!?_without_arts:1}0
- --enable-arts-shared \
-%endif
- --enable-ipv6
+ --disable-dependency-tracking \
+ --disable-rpath \
+ --disable-static \
+%{!?_without_arts:--enable-arts-shared} \
+ --enable-ipv6 \
+ --enable-kanji \
+ --enable-texthack \
+ --with-pic
%{__perl} -pi.orig -e 's|-lpthread|-lpthread -L/%{_lib}|g' Makefile */Makefile */*/Makefile */*/*/Makefile
-make
+%{__make}
ln -snf ../libxmms/configfile.h xmms/configfile.h
%if %{!?_without_arts:1}0
-export XMMS_CONFIG=`pwd`/xmms-config
+export XMMS_CONFIG="$(pwd)/xmms-config"
cd arts_output-%{artsplugin_ver}
-CFLAGS="$RPM_OPT_FLAGS -I.. -I/usr/include/gtk-1.2" %configure
-make
+CFLAGS="$RPM_OPT_FLAGS -I.." %configure --disable-rpath
+%{__make}
cd ..
%endif
@@ -180,14 +186,12 @@
%install
%{__rm} -rf %{buildroot}
%{__install} -d -m0755 %{buildroot}
-%{__make} install \
- DESTDIR=%{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+%find_lang %{name}
%if %{!?_without_arts:1}0
-make install -C arts_output-%{artsplugin_ver}\
- DESTDIR="%{buildroot}"
+%{__make} install -C arts_output-%{artsplugin_ver} DESTDIR="%{buildroot}"
%endif
-%find_lang %{name}
#install -m 755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input
@@ -205,18 +209,19 @@
%{__install} -Dp -m0644 $RPM_SOURCE_DIR/xmms.xpm %{buildroot}%{_datadir}/pixmaps/xmms.xpm
# unpackaged files
-rm -f %{buildroot}/%{_datadir}/xmms/*/lib*.{a,la} \
- %{buildroot}/%{_libdir}/libxmms.la \
- %{buildroot}/%{_libdir}/xmms/*/*.la \
- %{buildroot}/%{_mandir}/man1/gnomexmms*
+rm -f %{buildroot}%{_datadir}/xmms/*/lib*.{a,la} \
+ %{buildroot}%{_libdir}/libxmms.la \
+ %{buildroot}%{_libdir}/xmms/*/*.la \
+ %{buildroot}%{_mandir}/man1/gnomexmms*
-
%post
/sbin/ldconfig
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database %{_datadir}/desktop-menu-patches &>/dev/null || :
%postun
/sbin/ldconfig
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database %{_datadir}/desktop-menu-patches &>/dev/null || :
%clean
@@ -252,7 +257,7 @@
%{_includedir}/xmms
%{_bindir}/xmms-config
%{_datadir}/aclocal/xmms.m4
-%{_libdir}/lib*.a
+#%{_libdir}/lib*.a
%{_libdir}/lib*.so
%files mp3
Modified: trunk/rpms/xorp/xorp.spec
===================================================================
--- trunk/rpms/xorp/xorp.spec 2007-03-21 22:18:42 UTC (rev 5236)
+++ trunk/rpms/xorp/xorp.spec 2007-03-23 10:16:38 UTC (rev 5237)
@@ -3,7 +3,7 @@
Summary: Xorp is an Open Router Platform
Name: xorp
-Version: 1.3
+Version: 1.4
Release: 1
License: BSD
Group: Applications/Internet
@@ -50,6 +50,9 @@
%changelog
+* Thu Mar 22 2007 Dag Wieers <dag at wieers.com> - 1.4-1
+- Updated to release 1.4.
+
* Tue Sep 26 2006 Dries Verachtert <dries at ulyssis.org> - 1.3-1
- Updated to release 1.3.
Modified: trunk/rpms/xosd/xosd.spec
===================================================================
--- trunk/rpms/xosd/xosd.spec 2007-03-21 22:18:42 UTC (rev 5236)
+++ trunk/rpms/xosd/xosd.spec 2007-03-23 10:16:38 UTC (rev 5237)
@@ -2,6 +2,14 @@
# Authority: matthias
# Upstream: Tim Wright <tim$ignavus,net>
+%{?dist: %{expand: %%define %dist 1}}
+
+%{!?dist:%define _with_modxorg 1}
+%{?fc7:%define _with_modxorg 1}
+%{?el5:%define _with_modxorg 1}
+%{?fc6:%define _with_modxorg 1}
+%{?fc5:%define _with_modxorg 1}
+
%define xmms_generaldir %(xmms-config --general-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/General)
Summary: Displays transparent text on your screen like the OSD of TVs
@@ -13,7 +21,10 @@
URL: http://libxosd.sourceforge.net/
Source: http://dl.sf.net/libxosd/xosd-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, gtk+-devel, gdk-pixbuf-devel, xmms-devel
+BuildRequires: gcc-c++, gtk+-devel, gdk-pixbuf-devel
+%{!?_without_xmms:BuildRequires: xmms-devel}
+%{?_with_modxorg:BuildRequires: libX11-devel, libXext-devel, libXinerama-devel}
+%{!?_with_modxorg:BuildRequires: XFree86-devel}
%description
XOSD displays text on your screen, sounds simple right? The difference is
@@ -48,7 +59,6 @@
%prep
%setup
-
%build
%configure \
--disable-dependency-tracking \
@@ -59,7 +69,7 @@
%install
%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
%post -p /sbin/ldconfig
@@ -74,25 +84,27 @@
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/osd_cat
+%{_datadir}/xosd/
%{_libdir}/libxosd.so.*
-%{_datadir}/xosd/
%{_mandir}/man1/osd_cat.1*
%files devel
%defattr(-, root, root, 0755)
%{_bindir}/xosd-config
+%{_datadir}/aclocal/*.m4
%{_includedir}/xosd.h
%{_libdir}/libxosd.a
+%exclude %{_libdir}/libxosd.la
%{_libdir}/libxosd.so
-%{_datadir}/aclocal/*.m4
-%exclude %{_libdir}/libxosd.la
%{_mandir}/man1/xosd-config.1*
%{_mandir}/man3/*.3*
+%if %{!?_without_xmms:1}0
%files -n xmms-xosd
%defattr(-, root, root, 0755)
%{xmms_generaldir}/*.so
%exclude %{xmms_generaldir}/*.la
+%endif
%changelog
More information about the svn-commits
mailing list