Skip to content
Browse files

Updates

  • Loading branch information...
1 parent fa49432 commit f54bc3f002d435d6e0ebdf49a223f093a0bf926b @dagwieers dagwieers committed Nov 26, 2004
View
25 specs/bochs/bochs.spec
@@ -4,17 +4,6 @@
# Distcc: 0
-%{?dist: %{expand: %%define %dist 1}}
-
-%{?fc1:%define _without_xorg 1}
-%{?el3:%define _without_xorg 1}
-%{?rh9:%define _without_xorg 1}
-%{?rh8:%define _without_xorg 1}
-%{?rh7:%define _without_xorg 1}
-%{?el2:%define _without_xorg 1}
-%{?rh6:%define _without_xorg 1}
-%{?yd3:%define _without_xorg 1}
-
%define logmsg logger -t %{name}/rpm
Summary: IA-32 (x86) PC emulator
@@ -23,17 +12,15 @@ Version: 2.1.1
Release: 1
License: LGPL
Group: Applications/Emulators
-URL: http://bochs.sourceforge.net/
+URL: http://bochs.sf.net/
Packager: Dag Wieers <dag@wieers.com>
Vendor: Dag Apt Repository, http://dag.wieers.com/apt/
Source: http://dl.sf.net/bochs/bochs-%{version}.tar.gz
#Source1: http://bochs.sf.net/guestos/dlxlinux4.tar.gz
+Patch: bochs-2.1.1-gcc342.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++
-%{?_without_xorg:BuildRequires: XFree86-devel}
-%{!?_without_xorg:BuildRequires: xorg-x11-devel}
%description
Bochs is a portable x86 PC emulation software package that emulates enough of
@@ -43,6 +30,7 @@ and other OS's, all on your workstation.
%prep
%setup
#setup -a 1
+%patch -b .gcc243
%build
%configure \
@@ -71,7 +59,7 @@ and other OS's, all on your workstation.
%{buildroot}%{_mandir} \
%{buildroot}%{_datadir}/bochs/dlxlinux/
%makeinstall \
- docdir="rpm-doc"
+ docdir="doc-rpm"
#makeinstall install_dlx
#%{__install} -m0644 dlxlinux/* %{buildroot}%{_datadir}/bochs/dlxlinux/
@@ -85,14 +73,17 @@ fi
%files
%defattr(-, root, root, 0755)
-%doc README-* TESTFORM.txt rpm-doc/* docs-html/*
+%doc README-* TESTFORM.txt doc-rpm/* docs-html/*
#doc dlxlinux/*.txt
%doc %{_mandir}/man?/*
%{_bindir}/*
#%{_libdir}/bochs/
%{_datadir}/bochs/
%changelog
+* Fri Nov 26 2004 Dag Wieers <dag@wieers.com> - 2.1.1-1
+- Added patch for fc3/i386. (Nigel Smith)
+
* Wed Apr 07 2004 Dag Wieers <dag@wieers.com> - 2.1.1-1
- Updated to release 2.1.1.
View
15 specs/dstat/dstat.spec
@@ -2,9 +2,14 @@
# Authority: dag
# Upstream: Dag Wieers <dag@wieers.com>
+%{?dist: %{expand: %%define %dist 1}}
+
+%{?rh7:%define _with_python15 1}
+%{?el2:%define _with_python15 1}
+
Summary: Versatile vmstat, iostat and ifstat replacement
Name: dstat
-Version: 0.5.3
+Version: 0.5.4
Release: 1
License: GPL
Group: System Environment/Base
@@ -53,18 +58,24 @@ interprete real-time data as easy as possible.
%{__rm} -rf %{buildroot}
%makeinstall
+%{?_with_python15:%{__install} -D -m0755 dstat15 %{buildroot}%{_bindir}/dstat}
+
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README* TESTS TODO
#%doc *.conf
%doc %{_mandir}/man1/dstat.1*
#%config(noreplace) %{_sysconfdir}/dstat.conf
%{_bindir}/dstat
%changelog
+* Thu Nov 25 2004 Dag Wieers <dag@wieers.com> - 0.5.4-1
+- Updated to release 0.5.4.
+- Use dstat15 if distribution uses python 1.5.
+
* Sun Nov 21 2004 Dag Wieers <dag@wieers.com> - 0.5.3-1
- Updated to release 0.5.3.
View
1 specs/gdesklets/gdesklets.spec
@@ -84,6 +84,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gdesklets-displ
%{_libdir}/pkgconfig/gdesklets-core.pc
%exclude %{_datadir}/mime/XMLnamespaces
%{_datadir}/mime/application/x-gdesklets-display.xml
+%exclude %{_datadir}/applications/mimeinfo.cache
%exclude %{_datadir}/mime/globs
%exclude %{_datadir}/mime/magic
%{_datadir}/mime/packages/gdesklets.xml
View
39 specs/j2re/j2re.spec
@@ -3,17 +3,17 @@
%{?dist: %{expand: %%define %dist 1}}
-%{?fc7:%define _without_gcc3 1}
+%{?rh7:%define _without_gcc3 1}
%{?el2:%define _without_gcc3 1}
%{?rh6:%define _without_gcc3 1}
%define real_version 1_4_2
-%define real_release 04
+%define real_release 06
Summary: Sun Java(tm) 2 Runtime Environment
Name: j2re
Version: 1.4.2
-Release: 10
+Release: 11
Group: Development/Languages
License: Redistributable, BCLA
URL: http://java.sun.com/j2se/1.4.2/download.html
@@ -184,23 +184,25 @@ cd j2re%{version}_%{real_release}
%{__mv} -f CHANGES COPYRIGHT ControlPanel.html LICENSE README THIRDPARTYLICENSEREADME.txt Welcome.html ../
%{__install} -d -m0755 %{buildroot}%{_bindir}
-%{__ln_s} -f ../lib/jre/bin/java %{buildroot}%{_bindir}/java
-%{__ln_s} -f ../lib/jre/javaws/javaws %{buildroot}%{_bindir}/javaws
+%{__ln_s} -f ../lib/jre/bin/java %{buildroot}%{_bindir}/
+%{__ln_s} -f ../lib/jre/javaws/javaws %{buildroot}%{_bindir}/
%{__install} -D -m0644 plugin/desktop/sun_java.png %{buildroot}%{_datadir}/pixmaps/java.png
find %{buildroot}%{_libdir}/jre/ -type f -exec %{__chmod} 0644 {} \;
find %{buildroot}%{_libdir}/jre/bin/ -type f -exec %{__chmod} 0755 {} \;
+find %{buildroot}%{_libdir}/jre/ -type f -name "*.so" -exec %{__chmod} 0755 {} \;
+
#find . -type f -exec %{__chmod} 0644 {} \;
%{__chmod} 0644 %{buildroot}%{_mandir}/man?/*
%{__chmod} 0755 %{buildroot}%{_libdir}/jre/javaws/javaws{,bin}
-%{__install} -d -m0755 %{buildroot}%{_libdir}/mozilla/plugins
+%{__install} -d -m0755 %{buildroot}%{_libdir}/mozilla/plugins/
%{!?_without_gcc3:%{__ln_s} -f %{_libdir}/jre/plugin/i386/ns610-gcc32/libjavaplugin_oji.so %{buildroot}%{_libdir}/mozilla/plugins/}
%{?_without_gcc3:%{__ln_s} -f %{_libdir}/jre/plugin/i386/ns610/libjavaplugin_oji.so %{buildroot}%{_libdir}/mozilla/plugins/}
-%{__install} -d -m0755 %{buildroot}%{_libdir}/netscape/plugins
+%{__install} -d -m0755 %{buildroot}%{_libdir}/netscape/plugins/
%{__ln_s} -f %{_libdir}/jre/plugin/i386/ns4/libjavaplugin.so %{buildroot}%{_libdir}/netscape/plugins/
### Clean up buildroot
@@ -220,24 +222,29 @@ find %{buildroot}%{_libdir}/jre/bin/ -type f -exec %{__chmod} 0755 {} \;
%doc CHANGES COPYRIGHT ControlPanel.html LICENSE README THIRDPARTYLICENSEREADME.txt Welcome.html
%doc %{_mandir}/man?/*
%dir %{_libdir}/jre/
-%config %{_sysconfdir}/profile.d/*.sh
-%{_bindir}/*
-%{_datadir}/application-registry/*.applications
-%{_datadir}/applications/*.desktop
-%{_datadir}/mime-info/*
-%{_datadir}/pixmaps/*.png
-%{_datadir}/mime/packages/*.xml
+%config %{_sysconfdir}/profile.d/java.sh
+%{_bindir}/java
+%{_bindir}/javaws
+%{_datadir}/application-registry/java.applications
+%{_datadir}/applications/java.desktop
+%{_datadir}/mime-info/java.*
+%{_datadir}/pixmaps/java.png
+%{_datadir}/mime/packages/java.xml
%{_libdir}/jre/bin/
%{_libdir}/jre/lib/
%{_libdir}/jre/javaws/
%files -n mozilla-j2re
%defattr(-, root, root, 0755)
%{_libdir}/jre/plugin/
-%{_libdir}/mozilla/plugins/*
-%{_libdir}/netscape/plugins/*
+%{_libdir}/mozilla/plugins/libjavaplugin_oji.so
+%{_libdir}/netscape/plugins/libjavaplugin.so
%changelog
+* Thu Nov 25 2004 Dag Wieers <dag@wieers.com> - 1.4.2-11
+- Updated to release 1_4_2_06.
+- Made plugins executable. (Nils Toedtmann)
+
* Thu Nov 18 2004 Dag Wieers <dag@wieers.com> - 1.4.2-10
- Removed %%{_libdir}/mozilla/plugins/
View
11 specs/swfdec/swfdec.spec
@@ -68,12 +68,18 @@ Mozilla plugin for rendering of Flash animations based on the swfdec library.
%post
/sbin/ldconfig 2>/dev/null
+/usr/bin/update-gdk-pixbuf-loaders . || :
+
+### Backward compatibility for gtk < 2.4.13-9
[ -x %{_bindir}/gdk-pixbuf-query-loaders ] && \
%{_bindir}/gdk-pixbuf-query-loaders > \
%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders || :
%postun
/sbin/ldconfig 2>/dev/null
+/usr/bin/update-gdk-pixbuf-loaders . || :
+
+### Backward compatibility for gtk < 2.4.13-9
[ -x %{_bindir}/gdk-pixbuf-query-loaders ] && \
%{_bindir}/gdk-pixbuf-query-loaders > \
%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders || :
@@ -106,7 +112,10 @@ Mozilla plugin for rendering of Flash animations based on the swfdec library.
%changelog
-* Wed Nov 24 2004 Matthias Saou <http://freshrpms.net/> 0.3.2-2
+* Fri Nov 26 2004 Dag Wieers <dag@wieers.com> - 0.3.2-3
+- Added update-gdk-pixbuf-loaders to scriptlets.
+
+* Thu Nov 25 2004 Matthias Saou <http://freshrpms.net/> 0.3.2-2
- Make scriplets never return a failure.
* Wed Nov 24 2004 Matthias Saou <http://freshrpms.net/> 0.3.2-1
View
31 specs/windowmaker/windowmaker.spec
@@ -5,7 +5,7 @@
Summary: Fast, feature rich Window manager
Name: windowmaker
-Version: 0.90.0
+Version: 0.91.0
Release: 1
License: GPL
Group: User Interface/Desktops
@@ -80,7 +80,10 @@ export LINGUAS="$(cd po; echo *.po | sed -e 's|zh_TW.Big5.po||g; s|.po||g')"
%install
%{__rm} -rf %{buildroot}
%makeinstall \
- NLSDIR="%{buildroot}%{_datadir}/locale"
+ NLSDIR="%{buildroot}%{_datadir}/locale" \
+ wprefsdir="%{buildroot}%{_libdir}/GNUstep/WPrefs.app" \
+ wpexecbindir="%{buildroot}%{_libdir}/GNUstep/WPrefs.app" \
+ wpdatadir="%{buildroot}%{_libdir}/GNUstep/WPrefs.app"
%find_lang %{real_name}
%find_lang WPrefs
%find_lang WINGs
@@ -95,29 +98,33 @@ export LINGUAS="$(cd po; echo *.po | sed -e 's|zh_TW.Big5.po||g; s|.po||g')"
%files -f %{real_name}.lang
%defattr(-, root, root, 0755)
%doc AUTHORS BUGFORM BUGS ChangeLog COPYING* FAQ* NEWS README* TODO
-%doc %{_mandir}/man?/*
+%doc %{_mandir}/man1/*.1*
%config %{_sysconfdir}/X11/gdm/Sessions/*
%config %{_sysconfdir}/X11/dm/Sessions/windowmaker.desktop
%config %{_sysconfdir}/WindowMaker/
%{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/libwraster.so.*
%{_libdir}/GNUstep/
%{_datadir}/WindowMaker/
%{_datadir}/WINGs/
%files devel
%defattr(-, root, root, 0755)
%{_includedir}/*.h
-%{_libdir}/*.a
-%exclude %{_libdir}/*.la
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*
+%{_libdir}/libwraster.a
+%exclude %{_libdir}/libwraster.la
+%{_libdir}/libwraster.so
+%{_libdir}/pkgconfig/*.pc
%changelog
-* Sun Oct 24 2004 Chris Gordon <chris-rpm@linux-dr.net> 0.90.0-1
-- New package for version 0.90.
-- enabled xinerama support.
-- enabled virtual desktop support.
+* Thu Nov 25 2004 Juergen Moellenhoff <jm@tp1.rub.de> - 0.91.0-1
+- New package for version 0.91.0.
+- Changed wprefsdir, wpexecbindir and wpdatadir to the correct install path.
+
+* Sun Oct 24 2004 Chris Gordon <chris-rpm@linux-dr.net> - 0.90.0-1
+- New package for version 0.90.0.
+- Enabled xinerama support.
+- Enabled virtual desktop support.
* Tue Jun 15 2004 Dag Wieers <dag@wieers.com> - 0.80.2-5
- Added desktop file for GDM menu. (Chris Gordon)

0 comments on commit f54bc3f

Please sign in to comment.
Something went wrong with that request. Please try again.