rpms/imlib2/FC-1 imlib2-1.2.0-configure-xlib64.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 imlib2.spec, 1.4, 1.5 sources, 1.3, 1.4
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/imlib2/FC-1
In directory cvs.fedora.redhat.com:/tmp/cvs-serv16186/FC-1
Modified Files:
.cvsignore imlib2.spec sources
Added Files:
imlib2-1.2.0-configure-xlib64.patch
Log Message:
auto-import imlib2-1.2.0-0.fdr.4.1 on branch FC-1 from imlib2-1.2.0-0.fdr.4.1.src.rpm
imlib2-1.2.0-configure-xlib64.patch:
--- NEW FILE imlib2-1.2.0-configure-xlib64.patch ---
--- configure.old 2005-01-09 18:36:09.314185880 +0100
+++ configure 2005-01-09 18:37:15.840072408 +0100
@@ -20262,7 +20262,7 @@
if test "x$have_x" = "xyes"; then
x_dir="/usr/X11R6";
x_cflags="-I"$x_dir"/include"
- x_libs="-L"$x_dir"/lib -lX11 -lXext"
+ x_libs="-L"$x_dir"/lib64 -lX11 -lXext"
echo "$as_me:$LINENO: result: enabling X11 support" >&5
echo "${ECHO_T}enabling X11 support" >&6
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-1/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 04:35:55 -0000 1.3
+++ .cvsignore 29 Jan 2005 22:23:12 -0000 1.4
@@ -1 +1 @@
-imlib2-1.1.2.tar.gz
+imlib2-1.2.0.tar.gz
Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-1/imlib2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- imlib2.spec 8 Nov 2004 04:35:55 -0000 1.4
+++ imlib2.spec 29 Jan 2005 22:23:12 -0000 1.5
@@ -1,15 +1,19 @@
Summary: A graphic library for file loading, saving, rendering, and manipulation
Name: imlib2
-Version: 1.1.2
-Release: 0.fdr.1.1
+Version: 1.2.0
+Release: 0.fdr.4.1
Epoch: 0
License: BSD
Group: System Environment/Libraries
URL: http://www.enlightenment.org/pages/imlib2.html
Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
+Patch0: imlib2-1.2.0-configure-xlib64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel
BuildRequires: libungif-devel freetype-devel libtool bzip2-devel
+%ifarch x86_64
+BuildRequires: perl
+%endif
%package devel
Summary: Development package for %{name}
@@ -39,33 +43,45 @@
%prep
%setup -q
+%ifarch x86_64
+%patch0 -b .patch0
+%endif
# -----------------------------------------------------------------------------
%build
%configure \
-%ifarch %{ix86} x86_64 ia64
+ --x-libraries=%{_prefix}/X11R6/%{_lib} \
+ --with-pic \
+%ifarch %{ix86} ia64
--enable-mmx
+%else
+ --disable-mmx
+%endif
+%ifarch x86_64
+# fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs
+# returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz":
+perl -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' Makefile */Makefile */*/Makefile imlib2-config
%endif
-make %{?_smp_mflags}
-make -C demo
+make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
# -----------------------------------------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT __doc
-make install DESTDIR=$RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT -C demo
+make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
cp -a doc __doc
rm -f __doc/Makefile*
rm -f \
- $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \
- $RPM_BUILD_ROOT%{_libdir}/imlib2_loaders/*/*.*a \
+ $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \
$RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test}
+# ship .la files due to a bug in kdelibs (see changelog):
+# $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \
+
# -----------------------------------------------------------------------------
%clean
@@ -79,22 +95,62 @@
%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS README ChangeLog TODO __doc/*
-%{_bindir}/imconvert
%{_bindir}/imlib2_view
+%{_bindir}/imlib2_bumpmap
+%{_bindir}/imlib2_colorspace
+%{_bindir}/imlib2_conv
+%{_bindir}/imlib2_poly
+%{_bindir}/imlib2_show
%{_libdir}/libImlib2.so.*
-%{_libdir}/imlib2_loaders
+%{_datadir}/imlib2/data/
+%dir %{_libdir}/imlib2/filters/
+%{_libdir}/imlib2/filters/*.so
+%{_libdir}/imlib2/filters/*.la
+%dir %{_libdir}/imlib2/loaders/
+%{_libdir}/imlib2/loaders/*.so
+%{_libdir}/imlib2/loaders/*.la
%files devel
%defattr(-,root,root,-)
%{_bindir}/imlib2-config
%{_includedir}/Imlib2.h
%{_libdir}/libImlib2.a
+%{_libdir}/libImlib2.la
%{_libdir}/libImlib2.so
%{_libdir}/pkgconfig/imlib2.pc
# -----------------------------------------------------------------------------
%changelog
+* Tue Jan 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.2.0-4
+- Make this 1.2.0-0.fdr.4 for FC2 and older.
+- Really include libtool archives to fix fedora.us bug #2284.
+
+* Fri Jan 14 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.2.0-3
+- Move filters and loaders back into main package where they belong
+
+* Mon Jan 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.2.0-2
+- Don't ship *.?.a in {_libdir}/imlib/filters/ and loaders/
+
+* Sun Jan 09 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.2.0-1
+- Ship .la files ue to a bug in kdelibs; see
+ https://bugzilla.fedora.us/show_bug.cgi?id=2284
+ http://bugzilla.redhat.com/bugzilla/142244
+ http://bugs.kde.org/93359
+- Use make param LIBTOOL=/usr/bin/libtool - fixes hardcoded rpath on x86_64
+- fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs
+ returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz"
+- Update to 1.2.0 -- fixes several security issues
+- remove explicit libdir=_libdir - 1.2.9 does not need it anymore
+- removeddemo compile/install;
+- use configure param --x-libraries={_prefix}/X11R6/{_lib} and patch to fix
+ "cannot find -lX11"
+
+* Thu Dec 30 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.1.2-2
+- Disable mmx on x86_64 (fixes Build error)
+- Add explicit libdir=_libdir to make calls to avoid install errors on x86_64
+- Add --with-pic configure option (taken from Matthias Saou's package)
+
* Sat Sep 25 2004 Ville Skytt�� <ville.skytta at iki.fi> - 0:1.1.2-0.fdr.1
- Update to 1.1.2, fixes CAN-2004-0802.
- Enable MMX on all ix86, x86_64 and ia64, it seems runtime-detected.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-1/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 04:35:55 -0000 1.3
+++ sources 29 Jan 2005 22:23:12 -0000 1.4
@@ -1 +1 @@
-3389bad516032c951fda4fe620df0cef imlib2-1.1.2.tar.gz
+853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz
19 years, 2 months
rpms/imlib2 import.log,1.7,1.8
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/imlib2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv16186
Modified Files:
import.log
Log Message:
auto-import imlib2-1.2.0-0.fdr.4.1 on branch FC-1 from imlib2-1.2.0-0.fdr.4.1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/imlib2/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log 8 Nov 2004 04:35:58 -0000 1.7
+++ import.log 29 Jan 2005 22:23:12 -0000 1.8
@@ -4,3 +4,4 @@
imlib2-1_0_6-0_fdr_3_2:HEAD:imlib2-1.0.6-0.fdr.3.2.src.rpm:1099888552
imlib2-1_1_2-0_fdr_1_1:FC-1:imlib2-1.1.2-0.fdr.1.1.src.rpm:1099888555
imlib2-1_1_2-0_fdr_1_2:HEAD:imlib2-1.1.2-0.fdr.1.2.src.rpm:1099888558
+imlib2-1_2_0-0_fdr_4_1:FC-1:imlib2-1.2.0-0.fdr.4.1.src.rpm:1107037385
19 years, 2 months
rpms/fontforge/devel fontforge.spec,1.6,1.7 pfaicon.gif,1.1,NONE
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/fontforge/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv15343
Modified Files:
fontforge.spec
Removed Files:
pfaicon.gif
Log Message:
Miscellaneous small improvements.
Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fontforge.spec 27 Jan 2005 18:19:46 -0000 1.6
+++ fontforge.spec 29 Jan 2005 21:20:57 -0000 1.7
@@ -1,6 +1,6 @@
Name: fontforge
Version: 0.0
-Release: 1.20041231
+Release: 2.20041231
Epoch: 0
Summary: An outline and bitmap font editor
@@ -10,7 +10,6 @@
Source0: http://dl.sf.net/fontforge/fontforge_full-20041231.tgz
Source1: fontforge.desktop
Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20041231.tgz
-Source3: pfaicon.gif
Patch1: fontforge-20040618-docview.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +21,6 @@
BuildRequires: libxml2-devel
BuildRequires: freetype-devel
BuildRequires: XFree86-devel
-BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
BuildRequires: libuninameslist-devel
Obsoletes: pfaedit
@@ -34,34 +32,40 @@
(Type2) and CID-keyed fonts.
%prep
-%setup -q -n fontforge-20041231
+%setup -q -n %{name}-20041231
%patch1 -p2 -b .docview
mkdir htdocs
tar xzf %{SOURCE2} -C htdocs
rm -rf htdocs/scripts
+chmod 644 htdocs/*
mkdir cidmaps
tar xzf htdocs/cidmaps.tgz -C cidmaps
find . -name "CVS" -type d -print | xargs rm -r
+for i in fontforge/fontforge.1 fontforge/sfddiff.1 ; do
+ iconv -f iso-8859-1 -t utf-8 $i -o $i.utf8 ; mv $i.utf8 $i
+done
+
+sed -i -e 's/-rpath $(libdir)//' fontforge/Makefile*.in
+
%build
%configure --with-regular-link --with-freetype-bytecode=no
-# Parallell make not working.
+# Parallel make not working.
make DOCDIR=%{_docdir}/%{name}-%{version}/htdocs
+
%install
rm -rf $RPM_BUILD_ROOT
# make install DESTDIR=$RPM_BUILD_ROOT fails.
%makeinstall
install -p -m 644 cidmaps/Adobe* $RPM_BUILD_ROOT%{_datadir}/fontforge
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgunicode.la $RPM_BUILD_ROOT%{_libdir}/libgdraw.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgunicode.so $RPM_BUILD_ROOT%{_libdir}/libgdraw.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/libg{draw,unicode}.{la,so}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-convert %{SOURCE3} fontforge.png
-install -m 644 fontforge.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+install -Dpm 644 htdocs/ffanvil32.png \
+ $RPM_BUILD_ROOT%{_datadir}/pixmaps/fontforge.png
desktop-file-install \
--vendor fedora \
@@ -69,6 +73,8 @@
--add-category X-Fedora \
%{SOURCE1}
+chmod -x $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontforge.pc
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -81,17 +87,24 @@
%files
%defattr(-,root,root,-)
-%doc AUTHORS INSTALL LICENSE README htdocs
+%doc AUTHORS LICENSE htdocs
%{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/libg*.so.*
%{_libdir}/pkgconfig/fontforge.pc
-%{_datadir}/applications/*.desktop
-%{_datadir}/%{name}
-%{_datadir}/pixmaps/*.png
+%{_datadir}/applications/*fontforge.desktop
+%{_datadir}/fontforge
+%{_datadir}/pixmaps/fontforge.png
%{_mandir}/man1/*.1*
%changelog
+* Sat Jan 29 2005 Ville Skytt�� <ville.skytta at iki.fi> - 0:0.0-2.20041231
+- Avoid RPATH.
+- Convert man pages to UTF-8.
+- Fix pkgconfig and doc file permissions.
+- Use updated upstream icon.
+- Don't include installation documentation.
+
* Mon Jan 17 2005 Marius L. J��hndal <mariuslj at ifi.uio.no> - 0:0.0-1.20041231
- Updated to 20041231.
19 years, 2 months
rpms/synaptic/devel synaptic.spec,1.7,1.8
by fedora-extras-commits@redhat.com
Author: wtogami
Update of /cvs/extras/rpms/synaptic/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv15332
Modified Files:
synaptic.spec
Log Message:
exclude multilib archs instead
Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- synaptic.spec 29 Jan 2005 21:12:53 -0000 1.7
+++ synaptic.spec 29 Jan 2005 21:20:56 -0000 1.8
@@ -20,7 +20,7 @@
BuildRequires: libstdc++-devel, gettext
BuildRequires: xmlto, perl-XML-Parser
BuildRequires: scrollkeeper
-ExclusiveArch: i386
+ExcludeArch: x86_64 ppc64
%description
Synaptic is a graphical package management
@@ -104,7 +104,7 @@
%changelog
* Sat Jan 29 2005 Warren Togami <wtogami(a)redhat.com> 0.55.3-2
-- ExclusiveArch: i386
+- ExcludeArch: x86_64 ppc64
* Tue Nov 09 2004 Panu Matilainen <pmatilai(a)welho.com> 0.55.3-1
- update to 0.55.3
19 years, 2 months
rpms/apt/devel apt.spec,1.7,1.8
by fedora-extras-commits@redhat.com
Author: wtogami
Update of /cvs/extras/rpms/apt/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv15263
Modified Files:
apt.spec
Log Message:
also exclude ppc64
Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apt.spec 28 Jan 2005 21:13:08 -0000 1.7
+++ apt.spec 29 Jan 2005 21:19:50 -0000 1.8
@@ -17,12 +17,12 @@
Summary: Debian's Advanced Packaging Tool with RPM support.
Name: apt
Version: 0.5.15cnc6
-Release: 14.%{svnver}
+Release: 15.%{svnver}
Epoch: 0
Group: System Environment/Base
URL: https://moin.conectiva.com.br/AptRpm
License: GPL
-ExcludeArch: x86_64
+ExcludeArch: x86_64 ppc64
# unfortunately the source isn't really directly downloadable with wget etc:
#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-...
@@ -360,6 +360,9 @@
%changelog
+* Sat Jan 29 2005 Warren Togami <wtogami(a)redhat.com> - 0:0.5.15cnc6-15.r362
+- ExcludeArch: ppc64
+
* Fri Jan 28 2005 Ville Skytt�� <ville.skytta at iki.fi> - 0:0.5.15cnc6-14.r362
- Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in
apt.conf.d/default.conf.
19 years, 2 months
rpms/synaptic/devel synaptic.spec,1.6,1.7
by fedora-extras-commits@redhat.com
Author: wtogami
Update of /cvs/extras/rpms/synaptic/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv15180
Modified Files:
synaptic.spec
Log Message:
ExclusiveArch: i386
Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- synaptic.spec 18 Jan 2005 18:31:07 -0000 1.6
+++ synaptic.spec 29 Jan 2005 21:12:53 -0000 1.7
@@ -4,7 +4,7 @@
Summary: Graphical frontend for APT package manager.
Name: synaptic
Version: 0.55.3
-Release: 1
+Release: 2
License: GPL
Group: Applications/System
Source: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz
@@ -20,6 +20,7 @@
BuildRequires: libstdc++-devel, gettext
BuildRequires: xmlto, perl-XML-Parser
BuildRequires: scrollkeeper
+ExclusiveArch: i386
%description
Synaptic is a graphical package management
@@ -102,6 +103,9 @@
%{_mandir}/man8/%{name}.8*
%changelog
+* Sat Jan 29 2005 Warren Togami <wtogami(a)redhat.com> 0.55.3-2
+- ExclusiveArch: i386
+
* Tue Nov 09 2004 Panu Matilainen <pmatilai(a)welho.com> 0.55.3-1
- update to 0.55.3
19 years, 2 months
rpms/libsafe/devel libsafe-2.0-16.spec,1.2,1.3
by fedora-extras-commits@redhat.com
Author: wtogami
Update of /cvs/extras/rpms/libsafe/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv15123
Modified Files:
libsafe-2.0-16.spec
Log Message:
ExclusiveArch: i386
Index: libsafe-2.0-16.spec
===================================================================
RCS file: /cvs/extras/rpms/libsafe/devel/libsafe-2.0-16.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsafe-2.0-16.spec 17 Dec 2004 01:38:37 -0000 1.2
+++ libsafe-2.0-16.spec 29 Jan 2005 21:07:16 -0000 1.3
@@ -10,6 +10,7 @@
Patch0: libsafe-2.0-16c.patch
URL: http://www.research.avayalabs.com/project/libsafe/index.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+ExclusiveArch: i386
%description
The libsafe library protects a process against the exploitation of buffer
@@ -87,6 +88,8 @@
rm -f /etc/ld.so.preload.tmp
%changelog
+* Sat Jan 29 2005 Warren Togami <wtogami(a)redhat.com>
+
* Thu Dec 16 2004 Warren Togami <wtogami(a)redhat.com> 2.0-16c
- Patch with Steve Grubb's libsafe-2.0-16c improvements
19 years, 2 months
rpms/rpmlint/devel .cvsignore, 1.3, 1.4 rpmlint-fedora-config, 1.1, 1.2 rpmlint.spec, 1.6, 1.7 sources, 1.3, 1.4
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv14367
Modified Files:
.cvsignore rpmlint-fedora-config rpmlint.spec sources
Log Message:
Update to 0.65, improve default config.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 05:18:56 -0000 1.3
+++ .cvsignore 29 Jan 2005 20:37:55 -0000 1.4
@@ -1 +1 @@
-rpmlint-0.61.tar.bz2
+rpmlint-0.65.tar.bz2
Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmlint-fedora-config 8 Nov 2004 05:18:23 -0000 1.1
+++ rpmlint-fedora-config 29 Jan 2005 20:37:55 -0000 1.2
@@ -6,12 +6,12 @@
setOption("Vendor", "Fedora Linux")
setOption("Distribution", "Fedora Linux")
-setOption("ReleaseExtension", "(\d+\.)+fdr\.\d+(\..*)?")
+setOption("ReleaseExtension", None)
setOption("ValidBuildHost", ".*")
setOption("Packager", ".*")
setOption("UseVersionInChangeLog", 1)
setOption("UseBzip2", 0)
-setOption("UseEpoch", 1)
+setOption("UseEpoch", 0)
setOption("ValidSrcPerms", (0644, ))
setOption("ValidGroups", (
"Amusements/Games",
@@ -78,5 +78,5 @@
# Output filters
addFilter("W: .* source-or-patch-not-[bg]zipped .*")
addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependancy (perl|python)-base.*")
+addFilter("E: .* no-dependency (perl|python)-base.*")
addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpmlint.spec 10 Dec 2004 22:03:10 -0000 1.6
+++ rpmlint.spec 29 Jan 2005 20:37:55 -0000 1.7
@@ -1,18 +1,18 @@
Name: rpmlint
-Version: 0.61
-Release: 2
+Version: 0.65
+Release: 1
Epoch: 0
Summary: RPM correctness checker
Group: Development/Tools
License: GPL
URL: http://people.mandrakesoft.com/~flepied/projects/rpmlint/
-Source0: http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.6...
+Source0: http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.6...
Source1: %{name}-fedora-config
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: python >= 0:1.5.2, rpm-python, make, perl
+BuildRequires: python >= 0:1.5.2, rpm-python, make, %{__perl}
Requires: rpm-python, python >= 0:1.5.2, cpio
%description
@@ -22,6 +22,8 @@
%prep
%setup -q
+%{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
+ FilesCheck.py I18NCheck.py
%build
@@ -31,9 +33,10 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-
-# Install Fedora config as the default.
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+install -pm 644 rpmlint.bash-completion $RPM_BUILD_ROOT%{_datadir}/rpmlint
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+touch $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
# Take care of files that may be generated later.
touch $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config{c,o}
@@ -56,16 +59,35 @@
rm -rf $RPM_BUILD_ROOT
+%triggerin -- bash-completion
+if [ ! -e %{_sysconfdir}/bash_completion.d/rpmlint ] ; then
+ ln -s %{_datadir}/rpmlint/rpmlint.bash-completion \
+ %{_sysconfdir}/bash_completion.d/rpmlint
+fi
+
+%triggerun -- bash-completion
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/rpmlint
+
+
%files -f %{name}-%{version}-files.list
%defattr(-,root,root,0755)
%doc AUTHORS COPYING ChangeLog README
%{_bindir}/rpm*
%dir %{_datadir}/rpmlint
+%{_datadir}/rpmlint/rpmlint.bash-completion
%dir %{_sysconfdir}/rpmlint
%config(noreplace) %{_sysconfdir}/rpmlint/config
+%ghost %{_sysconfdir}/bash_completion.d/rpmlint
%changelog
+* Sat Jan 29 2005 Ville Skytt�� <ville.skytta at iki.fi> - 0:0.65-1
+- Update to 0.65.
+
+* Sat Jan 1 2005 Ville Skytt�� <ville.skytta at iki.fi> - 0:0.64-1
+- Update to 0.64.
+- Default config tweaks: don't mandate Epochs nor "fdr" in Release.
+
* Tue Oct 19 2004 Ville Skytt�� <ville.skytta at iki.fi> - 0:0.61-0.fdr.2
- Requires cpio (bug 2169).
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 05:18:56 -0000 1.3
+++ sources 29 Jan 2005 20:37:55 -0000 1.4
@@ -1 +1 @@
-1e43509038848f1d8256a7ab2efe527b rpmlint-0.61.tar.bz2
+7e238f5121e2451fc1e100a4f13f26f0 rpmlint-0.65.tar.bz2
19 years, 2 months
devel/irssi irssi.spec,1.4,1.5
by fedora-extras-commits@redhat.com
Author: anvil
Update of /cvs/extras/devel/irssi
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11368
Modified Files:
irssi.spec
Log Message:
irssi.spec: Reduce Perl dir ownership and add MODULE_COMPAT dependency. (#143703)
Index: irssi.spec
===================================================================
RCS file: /cvs/extras/devel/irssi/irssi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- irssi.spec 10 Dec 2004 22:03:04 -0000 1.4
+++ irssi.spec 29 Jan 2005 16:42:13 -0000 1.5
@@ -3,7 +3,7 @@
Summary: Modular text mode IRC client with Perl scripting
Name: irssi
Version: 0.8.9
-Release: 4
+Release: 5
Epoch: 0
License: GPL
Group: Applications/Communications
@@ -18,6 +18,8 @@
%{?_with_glib1:BuildRequires: glib-devel}
%{!?_with_glib1:BuildRequires: glib2-devel}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
# ----------------------------------------------------------------------------
%description
@@ -73,10 +75,6 @@
%defattr(-,root,root,-)
%doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README TODO convert-replace-trigger.pl
%config(noreplace) %{_sysconfdir}/%{name}.conf
-%dir %{_libdir}/perl*/*
-%dir %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
-%dir %{perl_vendorarch}
-%dir %{perl_vendorarch}/auto
%{_bindir}/%{name}
%{_bindir}/botti
%{_datadir}/%{name}
@@ -88,6 +86,9 @@
# ----------------------------------------------------------------------------
%changelog
+* Fri Dec 24 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.8.9-5
+- Reduce Perl dir ownership and add MODULE_COMPAT dependency.
+
* Fri Apr 2 2004 Dams <anvil[AT]livna.org> 0:0.8.9-0.fdr.4
- Rebuilt to use new perl to prevent random segmentation fault at load
time
19 years, 2 months
rpms/gc/devel gc6.4-opendl.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gc.spec, 1.5, 1.6 sources, 1.3, 1.4 gc-6.3-opendl.patch, 1.1, NONE
by fedora-extras-commits@redhat.com
Author: mschwendt
Update of /cvs/extras/rpms/gc/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11268/devel
Modified Files:
.cvsignore gc.spec sources
Added Files:
gc6.4-opendl.patch
Removed Files:
gc-6.3-opendl.patch
Log Message:
auto-import gc-6.4-2 on branch devel from gc-6.4-2.src.rpm
gc6.4-opendl.patch:
--- NEW FILE gc6.4-opendl.patch ---
--- gc6.4/Makefile.am.opendl 2004-12-16 18:27:52.000000000 -0600
+++ gc6.4/Makefile.am 2005-01-10 09:58:12.000000000 -0600
@@ -55,7 +55,7 @@
# Include THREADDLLIBS here to ensure that the correct versions of
# linuxthread semaphore functions get linked:
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
libgc_la_DEPENDENCIES = @addobjs@
libgc_la_LDFLAGS = -version-info 1:2:0
@@ -65,7 +65,7 @@
sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
libgccpp_la_LDFLAGS = -version-info 1:2:0
EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
@@ -91,9 +91,9 @@
## are included in the distribution
# gctest_OBJECTS = test.o
gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la
test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgc.la ./libgccpp.la
TESTS = gctest $(extra_checks)
--- gc6.4/Makefile.in.opendl 2004-12-20 20:00:44.000000000 -0600
+++ gc6.4/Makefile.in 2005-01-10 09:59:11.000000000 -0600
@@ -188,7 +188,7 @@
# Include THREADDLLIBS here to ensure that the correct versions of
# linuxthread semaphore functions get linked:
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
libgc_la_DEPENDENCIES = @addobjs@
libgc_la_LDFLAGS = -version-info 1:2:0
@@ -199,7 +199,7 @@
libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
libgccpp_la_LDFLAGS = -version-info 1:2:0
AM_CXXFLAGS = @GC_CFLAGS@
@@ -212,9 +212,9 @@
# gctest_OBJECTS = test.o
gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la
test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgc.la ./libgccpp.la
TESTS = gctest $(extra_checks)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 04:21:45 -0000 1.3
+++ .cvsignore 29 Jan 2005 16:28:30 -0000 1.4
@@ -1 +1 @@
-gc6.3.tar.gz
+gc6.4.tar.gz
Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gc.spec 10 Dec 2004 22:03:02 -0000 1.5
+++ gc.spec 29 Jan 2005 16:28:30 -0000 1.6
@@ -1,22 +1,20 @@
# $Id$
-# define to --enable-threads, --enable-parallel-mark
-%define threads 1
-
-#define beta alpha6
-
Summary: C++ Garbage Collector
Name: gc
Epoch: 0
-Version: 6.3
-Release: 1%{?dist_tag}
+Version: 6.4
+# For Extras
+Release: 2
+# For kde-redhat
+#Release: 0.2%{?dist_tag}.kde
Group: System Environment/Libraries
License: BSD
Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/
-Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.3.tar.gz
+Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Patch1: gc-6.3-opendl.patch
+Patch1: gc6.4-opendl.patch
%description
@@ -42,7 +40,10 @@
%configure \
--disable-static \
--enable-cplusplus \
- %{?threads: --enable-threads=posix --enable-parallel-mark}
+ --enable-threads=posix \
+%ifarch %{ix86}
+ --enable-parallel-mark
+%endif
make %{?_smp_mflags}
@@ -84,6 +85,14 @@
%changelog
+* Wed Jan 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:6.4-2
+- --enable-threads unconditionally
+- --enable-parallel-mark only on %%ix86 (#144681)
+
+* Mon Jan 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:6.4-1
+- 6.4
+- update opendl patch
+
* Fri Jul 09 2004 Rex Dieter <rexdieter at sf.net> 0:6.3-0.fdr.1
- 6.3(final)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 04:21:45 -0000 1.3
+++ sources 29 Jan 2005 16:28:30 -0000 1.4
@@ -1 +1 @@
-8b37ee18cbeb1dfd1866958e280db871 gc6.3.tar.gz
+ef03495e980b834a99c0e27eedaa546e gc6.4.tar.gz
--- gc-6.3-opendl.patch DELETED ---
19 years, 2 months