[svn] r6395 - in trunk/rpms: . amrnb amrwb gsm liferea meld
perl-Nagios-Plugin syslinux
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Fri Jul 4 04:30:43 CEST 2008
Author: dag
Date: 2008-07-04 03:30:42 +0100 (Fri, 04 Jul 2008)
New Revision: 6395
Added:
trunk/rpms/amrwb/
trunk/rpms/amrwb/amrwb.spec
trunk/rpms/meld/meld-1.1.spec
Modified:
trunk/rpms/amrnb/amrnb.spec
trunk/rpms/gsm/gsm-makefile-dag.patch
trunk/rpms/gsm/gsm.spec
trunk/rpms/liferea/liferea-1.0.spec
trunk/rpms/liferea/liferea-1.2.16.spec
trunk/rpms/liferea/liferea-1.2.2.spec
trunk/rpms/liferea/liferea-1.2.23.spec
trunk/rpms/liferea/liferea.spec
trunk/rpms/meld/meld.spec
trunk/rpms/perl-Nagios-Plugin/perl-Nagios-Plugin.spec
trunk/rpms/syslinux/syslinux.spec
Log:
Updates
Modified: trunk/rpms/amrnb/amrnb.spec
===================================================================
--- trunk/rpms/amrnb/amrnb.spec 2008-07-02 17:28:50 UTC (rev 6394)
+++ trunk/rpms/amrnb/amrnb.spec 2008-07-04 02:30:42 UTC (rev 6395)
@@ -3,20 +3,22 @@
Summary: AMR NarrowBand speech codec
Name: amrnb
-Version: 0.0.1
-Release: 2
+Version: 7.0.0.2
+Release: 1
License: LGPL
Group: System Environment/Libraries
-URL: http://www.3gpp.org/
+URL: http://www.penguin.cz/~utx/amr
+
#Source: ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/kwm/amrnb-%{version}.tar.gz
-Source: http://distfiles.opendarwin.org/amrnb-%{version}.tar.gz
+#Source: http://distfiles.opendarwin.org/amrnb-%{version}.tar.gz
+Source: http://ftp.penguin.cz/pub/users/utx/amr/amrnb-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
BuildRequires: gcc-c++
%description
AMR-NB is a narrowband speech codec used in mobile phones.
-
%package devel
Summary: AMR NarrowBand speech codec development files
Group: Development/Libraries
@@ -25,44 +27,47 @@
%description devel
AMR-NB is a narrowband speech codec used in mobile phones development files.
-
%prep
%setup
-
%build
-%configure --enable-static
+%configure --disable-static
%{__make} %{?_smp_mflags}
-
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%clean
%{__rm} -rf %{buildroot}
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
%files
-%defattr(-,root,root,0755)
+%defattr(-, root, root, 0755)
%doc COPYING
+%{_bindir}/amrnb-decoder
+%{_bindir}/amrnb-decoder-etsi
+%{_bindir}/amrnb-decoder-if2
+%{_bindir}/amrnb-encoder
+%{_bindir}/amrnb-encoder-etsi
+%{_bindir}/amrnb-encoder-etsi-vad2
+%{_bindir}/amrnb-encoder-if2
+%{_bindir}/amrnb-encoder-if2-vad2
+%{_bindir}/amrnb-encoder-vad2
%{_libdir}/libamrnb.so.*
%files devel
-%defattr(-,root,root,0755)
+%defattr(-, root, root, 0755)
%{_includedir}/amrnb/
-%{_libdir}/libamrnb.a
+%{_libdir}/libamrnb.so
%exclude %{_libdir}/libamrnb.la
-%{_libdir}/libamrnb.so
+%changelog
+* Fri Jul 04 2008 Dag Wieers <dag at wieers.com> - 7.0.0.2-1
+- Updated to release 7.0.0.2.
-%changelog
* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 0.0.1-2
- Release bump to drop the disttag number in FC5 build.
Added: trunk/rpms/amrwb/amrwb.spec
===================================================================
--- trunk/rpms/amrwb/amrwb.spec (rev 0)
+++ trunk/rpms/amrwb/amrwb.spec 2008-07-04 02:30:42 UTC (rev 6395)
@@ -0,0 +1,64 @@
+# $Id$
+# Authority: dag
+
+Summary: AMR WideBand speech codec
+Name: amrwb
+Version: 7.0.0.3
+Release: 1
+License: LGPL
+Group: System Environment/Libraries
+URL: http://www.penguin.cz/~utx/amr
+
+#Source: ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/kwm/amrwb-%{version}.tar.gz
+#Source: http://distfiles.opendarwin.org/amrwb-%{version}.tar.gz
+Source: http://ftp.penguin.cz/pub/users/utx/amr/amrwb-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: gcc-c++
+
+%description
+AMR-WB is a wideband speech codec used in mobile phones.
+
+%package devel
+Summary: AMR WideBand speech codec development files
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+AMR-WB is a wideband speech codec used in mobile phones development files.
+
+%prep
+%setup
+
+%build
+%configure --disable-static
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc COPYING
+%{_bindir}/amrwb-decoder
+%{_bindir}/amrwb-decoder-if2
+%{_bindir}/amrwb-encoder
+%{_bindir}/amrwb-encoder-if2
+%{_libdir}/libamrwb.so.*
+
+%files devel
+%defattr(-, root, root, 0755)
+%{_includedir}/amrwb/
+%{_libdir}/libamrwb.so
+%exclude %{_libdir}/libamrwb.la
+
+%changelog
+* Fri Jul 04 2008 Dag Wieers <dag at wieers.com> - 7.0.0.3-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/amrwb/amrwb.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/gsm/gsm-makefile-dag.patch
===================================================================
--- trunk/rpms/gsm/gsm-makefile-dag.patch 2008-07-02 17:28:50 UTC (rev 6394)
+++ trunk/rpms/gsm/gsm-makefile-dag.patch 2008-07-04 02:30:42 UTC (rev 6395)
@@ -20,7 +20,7 @@
LD = $(CC)
-@@ -64,43 +68,27 @@
+@@ -64,43 +68,28 @@
# LDLIB = -lgcc
######### Additional libraries needed by $(LD)
@@ -56,6 +56,7 @@
-TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
+prefix = /usr/local
+libdir = $(prefix)/lib
++bindir = $(prefix)/bin
+includedir = $(prefix)/include
+datadir = $(prefix)/share
+mandir = $(datadir)/man
Modified: trunk/rpms/gsm/gsm.spec
===================================================================
--- trunk/rpms/gsm/gsm.spec 2008-07-02 17:28:50 UTC (rev 6394)
+++ trunk/rpms/gsm/gsm.spec 2008-07-04 02:30:42 UTC (rev 6395)
@@ -12,7 +12,8 @@
Group: System Environment/Libraries
URL: http://kbs.cs.tu-berlin.de/~jutta/toast.html
-Source: ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/gsm-%{version}.tar.gz
+#Source: ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/gsm-%{version}.tar.gz
+Source: http://kbs.cs.tu-berlin.de/~jutta/gsm/gsm-1.0.12.tar.gz
Patch: gsm-makefile-dag.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -42,13 +43,12 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}" prefix="%{_prefix}" libdir="%{_libdir}"
%{__ln_s} -f toast %{buildroot}%{_bindir}/untoast
%{__ln_s} -f toast %{buildroot}%{_bindir}/tcat
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
%clean
@@ -57,16 +57,23 @@
%files
%defattr(-, root, root, 0755)
%doc ChangeLog COPYRIGHT MACHINES MANIFEST README
-%doc %{_mandir}/man1/*
-%{_bindir}/*
-%{_libdir}/*.so.*
+#%doc %{_mandir}/man1/bitter.1*
+%doc %{_mandir}/man1/toast.1*
+#%{_bindir}/bitter
+%{_bindir}/tcat
+%{_bindir}/toast
+%{_bindir}/untoast
+%{_libdir}/libgsm.so.*
%files devel
%defattr(-, root, root, 0755)
-%doc %{_mandir}/man3/*
-%{_libdir}/*.a
-%{_libdir}/*.so
+%doc %{_mandir}/man3/gsm.3*
+%doc %{_mandir}/man3/gsm_explode.3*
+%doc %{_mandir}/man3/gsm_option.3*
+%doc %{_mandir}/man3/gsm_print.3*
%{_includedir}/gsm/
+%{_libdir}/libgsm.so
+%exclude %{_libdir}/libgsm.a
%changelog
* Wed Mar 7 2007 Matthias Saou <http://freshrpms.net/> 1.0.12-1
Modified: trunk/rpms/liferea/liferea-1.0.spec
===================================================================
--- trunk/rpms/liferea/liferea-1.0.spec 2008-07-02 17:28:50 UTC (rev 6394)
+++ trunk/rpms/liferea/liferea-1.0.spec 2008-07-04 02:30:42 UTC (rev 6395)
@@ -6,20 +6,21 @@
%{?dtag: %{expand: %%define %dtag 1}}
%{!?dtag: %define _without_mozilla 1}
-%{?fc6: %define _without_mozilla 1}
-%{?fc5: %define _without_mozilla 1}
-%{?fc1: %define _without_mozilla 1}
+%{?fc6: %define _without_mozilla 1}
+%{?fc5: %define _without_mozilla 1}
+%{?fc1: %define _without_mozilla 1}
%{!?dtag: %define with_dbus 1}
-%{?el5: %define with_dbus 1}
-%{?fc6: %define with_dbus 1}
+%{?el5: %define with_dbus 1}
+%{?fc6: %define with_dbus 1}
-%define mozilla seamonkey
-%{!?dtag:%define mozilla firefox}
-%{?el5:%define mozilla firefox}
-%{?fc6:%define mozilla firefox}
-%{?rh9:%define mozilla mozilla}
-%{?rh7:%define mozilla mozilla}
+%define mozilla xulrunner-devel nspr-devel
+%{?el5:%define mozilla xulrunner-devel nspr-devel}
+%{?el4:%define mozilla seamonkey-devel}
+%{?el3:%define mozilla seamonkey-devel}
+%{?rh9:%define mozilla mozilla-devel}
+%{?rh7:%define mozilla mozilla-devel}
+%{?el2:%define mozilla seamonkey-devel}
%define desktop_vendor rpmforge
@@ -37,7 +38,7 @@
BuildRequires: GConf2-devel >= 2.2, gtkhtml2-devel, libxml2-devel >= 2.5.10
BuildRequires: gettext, gcc-c++, desktop-file-utils, gtk2 >= 2.4
%{?_with_dbus:BuildRequires: dbus-devel >= 0.30}
-%{!?_without_mozilla:BuildRequires: %{mozilla}-devel}
+%{!?_without_mozilla:BuildRequires: %{mozilla}}
Requires: GConf2
%description
Modified: trunk/rpms/liferea/liferea-1.2.16.spec
===================================================================
--- trunk/rpms/liferea/liferea-1.2.16.spec 2008-07-02 17:28:50 UTC (rev 6394)
+++ trunk/rpms/liferea/liferea-1.2.16.spec 2008-07-04 02:30:42 UTC (rev 6395)
@@ -6,17 +6,22 @@
%{?dtag: %{expand: %%define %dtag 1}}
%{!?dtag: %define _without_mozilla 1}
-%{?fc6: %define _without_mozilla 1}
-%{?fc5: %define _without_mozilla 1}
-%{?fc1: %define _without_mozilla 1}
+%{?fc6: %define _without_mozilla 1}
+%{?fc5: %define _without_mozilla 1}
+%{?fc1: %define _without_mozilla 1}
-%define mozilla seamonkey
-%{!?dtag:%define mozilla firefox}
-%{?el5:%define mozilla firefox}
-%{?fc6:%define mozilla firefox}
-%{?rh9:%define mozilla mozilla}
-%{?rh7:%define mozilla mozilla}
+%{!?dtag: %define with_dbus 1}
+%{?el5: %define with_dbus 1}
+%{?fc6: %define with_dbus 1}
+%define mozilla xulrunner-devel nspr-devel
+%{?el5:%define mozilla xulrunner-devel nspr-devel}
+%{?el4:%define mozilla seamonkey-devel}
+%{?el3:%define mozilla seamonkey-devel}
+%{?rh9:%define mozilla mozilla-devel}
+%{?rh7:%define mozilla mozilla-devel}
+%{?el2:%define mozilla seamonkey-devel}
+
%define desktop_vendor rpmforge
%define real_version 1.2.16
@@ -34,7 +39,7 @@
BuildRequires: GConf2-devel >= 2.2, gtkhtml2-devel, libxml2-devel >= 2.6.27
BuildRequires: gettext, gcc-c++, desktop-file-utils, gtk2 >= 2.4, libxslt >= 1.1.19
-%{!?_without_mozilla:BuildRequires: %{mozilla}-devel}
+%{!?_without_mozilla:BuildRequires: %{mozilla}}
Requires: GConf2
%description
@@ -49,7 +54,7 @@
%build
%configure \
- --disable-schemas-install
+ --disable-schemas-install
%{__make} %{?_smp_mflags}
%install
@@ -57,12 +62,11 @@
%{__make} install DESTDIR="%{buildroot}"
%find_lang %{name}
-desktop-file-install \
- --delete-original \
- --vendor %{desktop_vendor} \
- --add-category X-Red-Hat-Base \
- --dir %{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applications/liferea.desktop
+desktop-file-install --delete-original \
+ --vendor %{desktop_vendor} \
+ --add-category X-Red-Hat-Base \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/liferea.desktop
%post
export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
Modified: trunk/rpms/liferea/liferea-1.2.2.spec
===================================================================
--- trunk/rpms/liferea/liferea-1.2.2.spec 2008-07-02 17:28:50 UTC (rev 6394)
+++ trunk/rpms/liferea/liferea-1.2.2.spec 2008-07-04 02:30:42 UTC (rev 6395)
@@ -6,29 +6,28 @@
%{?dtag: %{expand: %%define %dtag 1}}
%{!?dtag: %define _without_mozilla 1}
-%{?fc6: %define _without_mozilla 1}
-%{?fc5: %define _without_mozilla 1}
-%{?fc1: %define _without_mozilla 1}
+%{?fc6: %define _without_mozilla 1}
+%{?fc5: %define _without_mozilla 1}
+%{?fc1: %define _without_mozilla 1}
%{!?dtag: %define with_dbus 1}
-%{?el5: %define with_dbus 1}
-%{?fc6: %define with_dbus 1}
+%{?el5: %define with_dbus 1}
+%{?fc6: %define with_dbus 1}
-%define mozilla seamonkey
-%{!?dtag:%define mozilla firefox}
-%{?el5:%define mozilla firefox}
-%{?fc6:%define mozilla firefox}
-%{?rh9:%define mozilla mozilla}
-%{?rh7:%define mozilla mozilla}
+%define mozilla xulrunner-devel nspr-devel
+%{?el5:%define mozilla xulrunner-devel nspr-devel}
+%{?el4:%define mozilla seamonkey-devel}
+%{?el3:%define mozilla seamonkey-devel}
+%{?rh9:%define mozilla mozilla-devel}
+%{?rh7:%define mozilla mozilla-devel}
+%{?el2:%define mozilla seamonkey-devel}
%define desktop_vendor rpmforge
-%define real_version 1.2.2
-
Summary: RSS/RDF feed reader
Name: liferea
Version: 1.2.2
-Release: 2
+Release: 3
License: GPL
Group: Applications/Internet
URL: http://liferea.sourceforge.net/
@@ -40,7 +39,7 @@
#BuildRequires: libxml2-devel >= 2.6.26, libxslt >= 1.1.17
BuildRequires: gettext, gcc-c++, desktop-file-utils, gtk2 >= 2.4
%{?_with_dbus:BuildRequires: dbus-devel >= 0.30}
-%{!?_without_mozilla:BuildRequires: %{mozilla}-devel}
+%{!?_without_mozilla:BuildRequires: %{mozilla}}
Requires: GConf2
%description
@@ -51,7 +50,7 @@
using GtkHTML.
%prep
-%setup -n %{name}-%{real_version}
+%setup
%build
%configure \
@@ -96,6 +95,9 @@
%exclude %{_libdir}/liferea/*.la
%changelog
+* Thu Jul 03 2008 Dag Wieers <dag at wieers.com> - 1.2.2-3
+- Compiled against firefox-3.0.
+
* Mon Dec 03 2007 Heiko Adams <info-2007 at fedora-blog.de> - 1.2.2-2
- Enabled DBus (and Mozilla) usage on FC6 and EL5.
Modified: trunk/rpms/liferea/liferea-1.2.23.spec
===================================================================
--- trunk/rpms/liferea/liferea-1.2.23.spec 2008-07-02 17:28:50 UTC (rev 6394)
+++ trunk/rpms/liferea/liferea-1.2.23.spec 2008-07-04 02:30:42 UTC (rev 6395)
@@ -6,17 +6,22 @@
%{?dtag: %{expand: %%define %dtag 1}}
%{!?dtag: %define _without_mozilla 1}
-%{?fc6: %define _without_mozilla 1}
-%{?fc5: %define _without_mozilla 1}
-%{?fc1: %define _without_mozilla 1}
+%{?fc6: %define _without_mozilla 1}
+%{?fc5: %define _without_mozilla 1}
+%{?fc1: %define _without_mozilla 1}
-%define mozilla seamonkey
-%{!?dtag:%define mozilla firefox}
-%{?el5:%define mozilla firefox}
-%{?fc6:%define mozilla firefox}
-%{?rh9:%define mozilla mozilla}
-%{?rh7:%define mozilla mozilla}
+%{!?dtag: %define with_dbus 1}
+%{?el5: %define with_dbus 1}
+%{?fc6: %define with_dbus 1}
+%define mozilla xulrunner-devel nspr-devel
+%{?el5:%define mozilla xulrunner-devel nspr-devel}
+%{?el4:%define mozilla seamonkey-devel}
+%{?el3:%define mozilla seamonkey-devel}
+%{?rh9:%define mozilla mozilla-devel}
+%{?rh7:%define mozilla mozilla-devel}
+%{?el2:%define mozilla seamonkey-devel}
+
%define desktop_vendor rpmforge
Summary: RSS/RDF feed reader
@@ -33,7 +38,7 @@
BuildRequires: gettext, gcc-c++, desktop-file-utils
BuildRequires: gtk2 >= 2.4, GConf2-devel >= 2.2, gtkhtml2-devel
BuildRequires: libxml2-devel >= 2.6.27, libxslt >= 1.1.19
-%{!?_without_mozilla:BuildRequires: %{mozilla}-devel}
+%{!?_without_mozilla:BuildRequires: %{mozilla}}
Requires: GConf2
%description
@@ -48,7 +53,7 @@
%build
%configure \
- --disable-schemas-install
+ --disable-schemas-install
%{__make} %{?_smp_mflags}
%install
@@ -56,12 +61,11 @@
%{__make} install DESTDIR="%{buildroot}"
%find_lang %{name}
-desktop-file-install \
- --delete-original \
- --vendor %{desktop_vendor} \
- --add-category X-Red-Hat-Base \
- --dir %{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applications/liferea.desktop
+desktop-file-install --delete-original \
+ --vendor %{desktop_vendor} \
+ --add-category X-Red-Hat-Base \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/liferea.desktop
%post
export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
@@ -85,8 +89,8 @@
%{_datadir}/liferea/
%{_datadir}/icons/*/*/apps/liferea.png
%dir %{_libdir}/liferea/
+%{_libdir}/liferea/*.so*
%exclude %{_libdir}/liferea/*.la
-%{_libdir}/liferea/*.so*
%changelog
* Sun Oct 21 2007 Dag Wieers <dag at wieers.com> - 1.2.23-1
Modified: trunk/rpms/liferea/liferea.spec
===================================================================
--- trunk/rpms/liferea/liferea.spec 2008-07-02 17:28:50 UTC (rev 6394)
+++ trunk/rpms/liferea/liferea.spec 2008-07-04 02:30:42 UTC (rev 6395)
@@ -6,26 +6,27 @@
%{?dtag: %{expand: %%define %dtag 1}}
%{!?dtag: %define _without_mozilla 1}
-%{?fc6: %define _without_mozilla 1}
-%{?fc5: %define _without_mozilla 1}
-%{?fc1: %define _without_mozilla 1}
+%{?fc6: %define _without_mozilla 1}
+%{?fc5: %define _without_mozilla 1}
+%{?fc1: %define _without_mozilla 1}
%{!?dtag: %define with_dbus 1}
-%{?el5: %define with_dbus 1}
-%{?fc6: %define with_dbus 1}
+%{?el5: %define with_dbus 1}
+%{?fc6: %define with_dbus 1}
-%define mozilla seamonkey
-%{!?dtag:%define mozilla firefox}
-%{?el5:%define mozilla firefox}
-%{?fc6:%define mozilla firefox}
-%{?rh9:%define mozilla mozilla}
-%{?rh7:%define mozilla mozilla}
+%define mozilla xulrunner-devel nspr-devel
+%{?el5:%define mozilla xulrunner-devel nspr-devel}
+%{?el4:%define mozilla seamonkey-devel}
+%{?el3:%define mozilla seamonkey-devel}
+%{?rh9:%define mozilla mozilla-devel}
+%{?rh7:%define mozilla mozilla-devel}
+%{?el2:%define mozilla seamonkey-devel}
%define desktop_vendor rpmforge
Summary: RSS/RDF feed reader
Name: liferea
-Version: 1.4.5b
+Version: 1.4.16b
Release: 1
License: GPL
Group: Applications/Internet
@@ -39,7 +40,7 @@
BuildRequires: intltool, perl(XML::Parser)
BuildRequires: libxml2-devel >= 2.6.27, libxslt >= 1.1.19
%{?_with_dbus:BuildRequires: dbus-devel >= 0.30}
-%{!?_without_mozilla:BuildRequires: %{mozilla}-devel}
+%{!?_without_mozilla:BuildRequires: %{mozilla}}
Requires: GConf2
%description
@@ -95,6 +96,9 @@
%exclude %{_libdir}/liferea/*.la
%changelog
+* Thu Jul 03 2008 Dag Wieers <dag at wieers.com> - 1.4.16b-1
+- Updated to release 1.4.16b.
+
* Mon Dec 03 2007 Heiko Adams <info-2007 at fedora-blog.de> - 1.4.5b-2
- Enabled DBus (and Mozilla) usage on FC6 and EL5.
Added: trunk/rpms/meld/meld-1.1.spec
===================================================================
--- trunk/rpms/meld/meld-1.1.spec (rev 0)
+++ trunk/rpms/meld/meld-1.1.spec 2008-07-04 02:30:42 UTC (rev 6395)
@@ -0,0 +1,173 @@
+# $Id: meld.spec 6393 2008-06-30 22:25:34Z dag $
+# Authority: dag
+# Upstream: Stephen Kennedy <steve9000$users,sf,net>
+
+%define desktop_vendor rpmforge
+
+Summary: Graphical visual diff and merge tool
+Name: meld
+Version: 1.1.5
+Release: 1
+License: GPL
+Group: Applications/Text
+URL: http://meld.sourceforge.net/
+
+Source: http://ftp.gnome.org/pub/gnome/sources/meld/1.1/meld-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: pygtk2-devel >= 2.6, gnome-python2 >= 1.99.14
+BuildRequires: pyorbit-devel >= 1.99, desktop-file-utils
+
+BuildArch: noarch
+Requires: pygtk2 >= 2.6, gnome-python2 >= 1.99, gnome-python2-canvas
+Requires: pygtk2-libglade, gnome-python2-gconf >= 1.99
+
+%description
+Meld is a GNOME2 visual diff and merge tool. It integrates especially
+well with CVS. The diff viewer lets you edit files in place (diffs
+update dynamically), and a middle column shows detailed changes and
+allows merges.
+
+%prep
+%setup
+
+%{__cat} <<'EOF' >meld.sh
+#!/bin/sh
+exec %{_datadir}/meld/meld $@
+EOF
+
+%{__cat} <<EOF >meld.desktop
+[Desktop Entry]
+Name=Meld Diff Viewer
+Comment=Compare and merge multiple files
+Exec=meld
+Icon=meld.png
+Type=Application
+Terminal=false
+StartupNotify=true
+Encoding=UTF-8
+Categories=GNOME;Application;Development;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=meld
+X-GNOME-Bugzilla-Component=general
+EOF
+
+%build
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -Dp -m0755 meld.sh %{buildroot}%{_bindir}/meld
+%{__install} -Dp -m0644 glade2/pixmaps/icon.png %{buildroot}%{_datadir}/pixmaps/meld.png
+%{__install} -Dp -m0755 meld %{buildroot}%{_datadir}/meld/meld
+
+%{__install} -d -m0755 %{buildroot}%{_datadir}/meld/glade2/pixmaps/
+%{__install} -p -m0644 *.py %{buildroot}%{_datadir}/meld/
+%{__install} -d -m0755 %{buildroot}%{_datadir}/meld/vc/
+%{__install} -p -m0644 vc/* %{buildroot}%{_datadir}/meld/vc/
+%{__install} -p -m0644 glade2/*.glade* %{buildroot}%{_datadir}/meld/glade2/
+%{__install} -p -m0644 glade2/pixmaps/* %{buildroot}%{_datadir}/meld/glade2/pixmaps/
+
+%{__install} -d -m0755 %{buildroot}%{_datadir}/meld/po/
+%{__install} -p -m0644 po/*.po %{buildroot}%{_datadir}/meld/po/
+
+%{__install} -d -m0755 %{buildroot}%{_datadir}/meld/help/C/figures
+%{__install} -p -m0644 help/C/meld* %{buildroot}%{_datadir}/meld/help/C/
+%{__install} -p -m0644 help/C/figures/*.png %{buildroot}%{_datadir}/meld/help/C/figures/
+
+
+%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
+desktop-file-install --vendor %{desktop_vendor} \
+ --add-category X-Red-Hat-Base \
+ --dir %{buildroot}%{_datadir}/applications \
+ meld.desktop
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+#%doc AUTHORS changelog COPYING INSTALL TODO.txt manual/manual.html manual/stylesheet.css
+%doc AUTHORS changelog COPYING INSTALL
+%{_bindir}/meld
+%{_datadir}/applications/%{desktop_vendor}-meld.desktop
+%{_datadir}/meld/
+%{_datadir}/pixmaps/meld.png
+
+%changelog
+* Sun Jun 10 2007 Dag Wieers <dag at wieers.com> - 1.1.5-1
+- Updated to release 1.1.5.
+
+* Mon Jun 12 2006 Dag Wieers <dag at wieers.com> - 1.1.4-1
+- Updated to release 1.1.4.
+
+* Tue Feb 28 2006 Dag Wieers <dag at wieers.com> - 1.1.3-1
+- Updated to release 1.1.3.
+
+* Wed Dec 07 2005 Dries Verachtert <dries at ulyssis.org> - 1.1.2-2
+- Fixes: vc/* and help/* subdirectories added. (James Begley)
+
+* Wed Nov 30 2005 Dag Wieers <dag at wieers.com> - 1.1.2-1
+- Updated to release 1.1.2.
+
+* Mon Jul 11 2005 Dag Wieers <dag at wieers.com> - 1.0.0-1
+- Updated to release 1.0.0.
+
+* Wed May 18 2005 Dag Wieers <dag at wieers.com> - 0.9.6-1
+- Updated to release 0.9.6.
+
+* Sun Feb 06 2005 Dag Wieers <dag at wieers.com> - 0.9.5-1
+- Updated to release 0.9.5.
+
+* Fri Nov 19 2004 Dag Wieers <dag at wieers.com> - 0.9.4.1-2
+- Moved desktop entry from Utilities to Development. (Rudolf Kastl)
+
+* Sun Jul 18 2004 Dag Wieers <dag at wieers.com> - 0.9.4.1-1
+- Updated to release 0.9.4.1.
+
+* Fri Jul 16 2004 Dag Wieers <dag at wieers.com> - 0.9.4-1
+- Updated to release 0.9.4.
+
+* Wed May 26 2004 Dag Wieers <dag at wieers.com> - 0.9.3-1
+- Updated to release 0.9.3.
+
+* Tue Apr 13 2004 Dag Wieers <dag at wieers.com> - 0.9.2.1-1
+- Updated to release 0.9.2.1.
+
+* Tue Feb 17 2004 Dag Wieers <dag at wieers.com> - 0.9.2-0
+- Updated to release 0.9.2.
+
+* Sun Nov 23 2003 Dag Wieers <dag at wieers.com> - 0.9.1-0
+- Updated to release 0.9.1.
+
+* Mon Oct 13 2003 Dag Wieers <dag at wieers.com> - 0.9.0-0
+- Updated to release 0.9.0.
+
+* Thu Oct 09 2003 Dag Wieers <dag at wieers.com> - 0.8.5-1
+- Fixed meld.sh to accept arguments. (Sinisa Segvic)
+
+* Sun Aug 31 2003 Dag Wieers <dag at wieers.com> - 0.8.5-0
+- Updated to release 0.8.5.
+
+* Tue Jul 29 2003 Dag Wieers <dag at wieers.com> - 0.8.4-0
+- Updated to release 0.8.4.
+
+* Fri Jul 25 2003 Dag Wieers <dag at wieers.com> - 0.8.3-0
+- Updated to release 0.8.3.
+
+* Sun Jun 22 2003 Dag Wieers <dag at wieers.com> - 0.8.2-0
+- Updated to release 0.8.2.
+
+* Fri Jun 06 2003 Dag Wieers <dag at wieers.com> - 0.8.1-1
+- Added gnome-python2-gconf requirement. (Rudolf Kastl)
+
+* Tue May 20 2003 Dag Wieers <dag at wieers.com> - 0.8.1-0
+- Updated to release 0.8.1.
+
+* Wed Apr 16 2003 Dag Wieers <dag at wieers.com> - 0.7.1-0
+- Updated to release 0.7.1.
+
+* Mon Apr 07 2003 Dag Wieers <dag at wieers.com> - 0.7.0-0
+- Updated to release 0.7.0.
+
+* Wed Feb 12 2003 Dag Wieers <dag at wieers.com> - 0.6.6-0
+- Initial package. (using DAR)
Modified: trunk/rpms/meld/meld.spec
===================================================================
--- trunk/rpms/meld/meld.spec 2008-07-02 17:28:50 UTC (rev 6394)
+++ trunk/rpms/meld/meld.spec 2008-07-04 02:30:42 UTC (rev 6395)
@@ -15,11 +15,11 @@
Source: http://ftp.gnome.org/pub/gnome/sources/meld/1.2/meld-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: pygtk2-devel >= 2.6, gnome-python2 >= 1.99.14
+BuildRequires: pygtk2-devel >= 2.12, gnome-python2 >= 1.99.14
BuildRequires: pyorbit-devel >= 1.99, desktop-file-utils
BuildArch: noarch
-Requires: pygtk2 >= 2.6, gnome-python2 >= 1.99, gnome-python2-canvas
+Requires: pygtk2 >= 2.12, gnome-python2 >= 1.99, gnome-python2-canvas
Requires: pygtk2-libglade, gnome-python2-gconf >= 1.99
%description
Modified: trunk/rpms/perl-Nagios-Plugin/perl-Nagios-Plugin.spec
===================================================================
--- trunk/rpms/perl-Nagios-Plugin/perl-Nagios-Plugin.spec 2008-07-02 17:28:50 UTC (rev 6394)
+++ trunk/rpms/perl-Nagios-Plugin/perl-Nagios-Plugin.spec 2008-07-04 02:30:42 UTC (rev 6395)
@@ -1,6 +1,7 @@
# $Id$
# Authority: dag
# Upstream: Nagios Plugin Development Team <nagiosplug-devel$lists,sourceforge,net>
+# Upstream: Ton Voon <ton,voon$altinity,com>
%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
@@ -9,7 +10,7 @@
Summary: Family of perl modules to streamline writing Nagios
Name: perl-Nagios-Plugin
-Version: 0.26
+Version: 0.27
Release: 1
License: Artistic/GPL
Group: Applications/CPAN
@@ -53,6 +54,9 @@
%{perl_vendorlib}/Nagios/Plugin.pm
%changelog
+* Tue Jul 01 2008 Dag Wieers <dag at wieers.com> - 0.27-1
+- Updated to release 0.27.
+
* Wed May 14 2008 Dag Wieers <dag at wieers.com> - 0.26-1
- Updated to release 0.26.
Modified: trunk/rpms/syslinux/syslinux.spec
===================================================================
--- trunk/rpms/syslinux/syslinux.spec 2008-07-02 17:28:50 UTC (rev 6394)
+++ trunk/rpms/syslinux/syslinux.spec 2008-07-04 02:30:42 UTC (rev 6395)
@@ -8,7 +8,7 @@
Summary: Kernel bootloader for FAT or ISO9660 filesystems or PXE networks
Name: syslinux
-Version: 3.63
+Version: 3.70
Release: 1
License: GPL
Group: Applications/System
@@ -43,13 +43,14 @@
%{__make} install-all \
INSTALLROOT="%{buildroot}" \
BINDIR="%{_bindir}" \
- INCDIR="%{_includedir}" \
- LIBDIR="%{_prefix}/lib" \
MANDIR="%{_mandir}" \
SBINDIR="%{_sbindir}"
-%{__install} -p -m0755 keytab-lilo.pl mkdiskimage syslinux2ansi.pl %{buildroot}%{_prefix}/lib/syslinux/
-%{__install} -p -m0755 unix/syslinux unix/syslinux-nomtools %{buildroot}%{_prefix}/lib/syslinux/
+# INCDIR="%{_includedir}" \
+# LIBDIR="%{_prefix}/lib" \
+### Clean up buildroot
+%{__rm} -rf %{buildroot}/tftpboot/
+
### Clean up docroot
%{__make} -C sample tidy
@@ -65,15 +66,22 @@
%doc %{_mandir}/man1/syslinux.1*
%doc %{_mandir}/man1/syslinux2ansi.1*
%{_bindir}/gethostip
+%{_bindir}/keytab-lilo
%{_bindir}/lss16toppm
%{_bindir}/md5pass
+%{_bindir}/mkdiskimage
%{_bindir}/ppmtolss16
%{_bindir}/sha1pass
%{_bindir}/syslinux
-%{_prefix}/lib/syslinux/
+%{_bindir}/syslinux2ansi
+%{_datadir}/syslinux/
%{_sbindir}/extlinux
+/boot/extlinux/
%changelog
+* Fri Jul 04 2008 Dag Wieers <dag at wieers.com> - 3.70-1
+- Updated to release 3.70.
+
* Sat Apr 12 2008 Dag Wieers <dag at wieers.com> - 3.63-1
- Updated to release 3.63.
More information about the svn-commits
mailing list