rpms/libkexif/devel .cvsignore, 1.2, 1.3 libkexif.spec, 1.1, 1.2 sources, 1.2, 1.3
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/libkexif/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17557/devel
Modified Files:
.cvsignore libkexif.spec sources
Log Message:
auto-import libkexif-0.2.1-1 on branch devel from libkexif-0.2.1-1.src.rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libkexif/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 12 Jan 2005 20:12:52 -0000 1.2
+++ .cvsignore 29 Jan 2005 23:32:25 -0000 1.3
@@ -1 +1 @@
-libkexif-0.1.tar.bz2
+libkexif-0.2.1.tar.bz2
Index: libkexif.spec
===================================================================
RCS file: /cvs/extras/rpms/libkexif/devel/libkexif.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libkexif.spec 12 Jan 2005 20:12:52 -0000 1.1
+++ libkexif.spec 29 Jan 2005 23:32:25 -0000 1.2
@@ -1,19 +1,18 @@
Name: libkexif
-Version: 0.1
-Release: 2
+Version: 0.2.1
+Release: 1
Epoch: 0
Summary: Allow Kipi plugins to extract EXIF information
Group: System Environment/Libraries
License: GPL
-URL: http://extragear.kde.org/apps/kipi.php
-Source0: http://dl.sf.net/digikam/libkexif-0.1.tar.bz2
+URL: http://extragear.kde.org/apps/kipi
+Source0: http://dl.sf.net/digikam/libkexif-0.2.1.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libexif-devel >= 0:0.5.7, kdelibs-devel >= 6:3.0
BuildRequires: gettext
-
%description
This library allows Kipi plugins to extract EXIF information from JPEG files.
@@ -72,7 +71,11 @@
%changelog
-* Wed Jan 05 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.1-2
+* Mon Jan 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.2.1-1
+- version 0.2.1
+- update URL tag
+
+* Wed Jan 05 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.1-0.fdr.2
- Licence is GPL not LGPL
- Fix -devel description and requirements
- Switch group to "System Environment/Libraries"
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libkexif/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 12 Jan 2005 20:12:52 -0000 1.2
+++ sources 29 Jan 2005 23:32:25 -0000 1.3
@@ -1 +1 @@
-2d1ed6285fd9490c72327ff6dacd9185 libkexif-0.1.tar.bz2
+28a7eb727d6a884343ce8cbe061cb58f libkexif-0.2.1.tar.bz2
18 years
rpms/libkexif import.log,1.2,1.3
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/libkexif
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17557
Modified Files:
import.log
Log Message:
auto-import libkexif-0.2.1-1 on branch devel from libkexif-0.2.1-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libkexif/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log 12 Jan 2005 20:12:52 -0000 1.2
+++ import.log 29 Jan 2005 23:32:25 -0000 1.3
@@ -1 +1,2 @@
libkexif-0_1-2:HEAD:libkexif-0.1-2.src.rpm:1105560811
+libkexif-0_2_1-1:HEAD:libkexif-0.2.1-1.src.rpm:1107041539
18 years
rpms/awstats/devel .cvsignore, 1.2, 1.3 awstats.spec, 1.2, 1.3 sources, 1.2, 1.3
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/awstats/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17433/devel
Modified Files:
.cvsignore awstats.spec sources
Log Message:
auto-import awstats-6.3-0.1.20050122 on branch devel from awstats-6.3-0.1.20050122.src.rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:04:34 -0000 1.2
+++ .cvsignore 29 Jan 2005 23:30:42 -0000 1.3
@@ -1 +1 @@
-awstats-6.1.tgz
+awstats-6.3.tgz
Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- awstats.spec 10 Dec 2004 22:03:01 -0000 1.2
+++ awstats.spec 29 Jan 2005 23:30:42 -0000 1.3
@@ -1,11 +1,12 @@
Name: awstats
-Version: 6.1
-Release: 6
+Version: 6.3
+Release: 0.1.20050122
Summary: Advanced Web Statistics
License: GPL
Group: Applications/Internet
URL: http://awstats.sourceforge.net
-Source0: http://dl.sf.net/awstats/awstats-6.1.tgz
+Source0: http://awstats.sourceforge.net/files/awstats-6.3.tgz
+#Source0: http://dl.sf.net/awstats/awstats-6.3.tgz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: httpd
@@ -150,6 +151,12 @@
%{_datadir}/%{name}/wwwroot/js
%changelog
+* Thu Jan 27 2005 Aurelien Bompard <gauret[AT]free.fr> 6.3-0.1.20050122
+- update to 6.3pre to fix vulnerability
+
+* Sun Nov 28 2004 Aurelien Bompard <gauret[AT]free.fr> 6.2-0.fdr.1
+- version 6.2
+
* Thu May 20 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.6
- remove redundant substitution
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:04:34 -0000 1.2
+++ sources 29 Jan 2005 23:30:42 -0000 1.3
@@ -1 +1 @@
-4f02c0fc4f1a0f946fcae3b3768bf113 awstats-6.1.tgz
+4335067362c3033ca2c03e08abc67d73 awstats-6.3.tgz
18 years
rpms/awstats import.log,1.3,1.4
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/awstats
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17433
Modified Files:
import.log
Log Message:
auto-import awstats-6.3-0.1.20050122 on branch devel from awstats-6.3-0.1.20050122.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/awstats/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log 29 Jan 2005 23:29:36 -0000 1.3
+++ import.log 29 Jan 2005 23:30:42 -0000 1.4
@@ -1,2 +1,3 @@
awstats-6_1-0_fdr_6:HEAD:awstats-6.1-0.fdr.6.src.rpm:1099886674
awstats-6_3-0_fdr_0_1_20050122_2:FC-2:awstats-6.3-0.fdr.0.1.20050122.2.src.rpm:1107041369
+awstats-6_3-0_1_20050122:HEAD:awstats-6.3-0.1.20050122.src.rpm:1107041435
18 years
rpms/awstats/FC-2 .cvsignore, 1.2, 1.3 awstats.spec, 1.1, 1.2 sources, 1.2, 1.3
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/awstats/FC-2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17323/FC-2
Modified Files:
.cvsignore awstats.spec sources
Log Message:
auto-import awstats-6.3-0.fdr.0.1.20050122.2 on branch FC-2 from awstats-6.3-0.fdr.0.1.20050122.2.src.rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:04:34 -0000 1.2
+++ .cvsignore 29 Jan 2005 23:29:36 -0000 1.3
@@ -1 +1 @@
-awstats-6.1.tgz
+awstats-6.3.tgz
Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-2/awstats.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- awstats.spec 8 Nov 2004 04:04:34 -0000 1.1
+++ awstats.spec 29 Jan 2005 23:29:36 -0000 1.2
@@ -1,11 +1,12 @@
Name: awstats
-Version: 6.1
-Release: 0.fdr.6
+Version: 6.3
+Release: 0.fdr.0.1.20050122.2
Summary: Advanced Web Statistics
License: GPL
Group: Applications/Internet
URL: http://awstats.sourceforge.net
-Source0: http://dl.sf.net/awstats/awstats-6.1.tgz
+Source0: http://awstats.sourceforge.net/files/awstats-6.3.tgz
+#Source0: http://dl.sf.net/awstats/awstats-6.3.tgz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: httpd
@@ -150,6 +151,12 @@
%{_datadir}/%{name}/wwwroot/js
%changelog
+* Thu Jan 27 2005 Aurelien Bompard <gauret[AT]free.fr> 6.3-0.fdr.0.1.20050122
+- update to 6.3pre to fix vulnerability
+
+* Sun Nov 28 2004 Aurelien Bompard <gauret[AT]free.fr> 6.2-0.fdr.1
+- version 6.2
+
* Thu May 20 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.6
- remove redundant substitution
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:04:34 -0000 1.2
+++ sources 29 Jan 2005 23:29:36 -0000 1.3
@@ -1 +1 @@
-4f02c0fc4f1a0f946fcae3b3768bf113 awstats-6.1.tgz
+4335067362c3033ca2c03e08abc67d73 awstats-6.3.tgz
18 years
rpms/awstats import.log,1.2,1.3
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/awstats
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17323
Modified Files:
import.log
Log Message:
auto-import awstats-6.3-0.fdr.0.1.20050122.2 on branch FC-2 from awstats-6.3-0.fdr.0.1.20050122.2.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/awstats/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log 8 Nov 2004 04:04:34 -0000 1.2
+++ import.log 29 Jan 2005 23:29:36 -0000 1.3
@@ -1 +1,2 @@
awstats-6_1-0_fdr_6:HEAD:awstats-6.1-0.fdr.6.src.rpm:1099886674
+awstats-6_3-0_fdr_0_1_20050122_2:FC-2:awstats-6.3-0.fdr.0.1.20050122.2.src.rpm:1107041369
18 years
rpms/zope/devel zope.logrotate.cron.in, NONE, 1.1 zope.logrotate.in, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zope.spec, 1.1, 1.2
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/zope/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv16501/devel
Modified Files:
.cvsignore sources zope.spec
Added Files:
zope.logrotate.cron.in zope.logrotate.in
Log Message:
auto-import zope-2.7.4-1 on branch devel from zope-2.7.4-1.src.rpm
--- NEW FILE zope.logrotate.cron.in ---
#!/bin/bash
. <<SYSCONFDIR>>/sysconfig/zope
for instance in $ZOPE_INSTANCES; do
logrotate $instance/etc/logrotate.conf
done
--- NEW FILE zope.logrotate.in ---
<<INSTANCE_HOME>>/log/*.log {
missingok
sharedscripts
rotate 4
weekly
compress
postrotate
<<INSTANCE_HOME>>/bin/zopectl logreopen >/dev/null 2>&1
endscript
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Jan 2005 12:09:24 -0000 1.2
+++ .cvsignore 29 Jan 2005 22:57:17 -0000 1.3
@@ -1 +1 @@
-Zope-2.7.3-0.tgz
+Zope-2.7.4-0.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Jan 2005 12:09:24 -0000 1.2
+++ sources 29 Jan 2005 22:57:17 -0000 1.3
@@ -1 +1 @@
-15001ab6d429dc80b1f49735e8d2ee10 Zope-2.7.3-0.tgz
+97c310f1de4609956c176588b08b25c5 Zope-2.7.4-0.tgz
Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zope.spec 9 Jan 2005 12:09:24 -0000 1.1
+++ zope.spec 29 Jan 2005 22:57:17 -0000 1.2
@@ -12,19 +12,20 @@
Name: zope
Summary: Web application server for flexible content management applications
-Version: 2.7.3
-Release: 6
+Version: 2.7.4
+Release: 1
License: ZPL
Group: System Environment/Daemons
URL: http://www.zope.org/
-Source: http://zope.org/Products/Zope/2.7.3/Zope-2.7.3-0.tgz
+Source: http://zope.org/Products/Zope/2.7.4/Zope-2.7.4-0.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source1: zope.init.in
-#Source2: http://plope.com/software/zope-rpm/zope.logrotate.in
Source2: zope.sysconfig.in
Source3: zope.zopectl.in
Source4: zope-README.Fedora
+Source5: zope.logrotate.in
+Source6: zope.logrotate.cron.in
Patch0: zope-2.7.3-config.patch
BuildRequires: python-devel >= %{python_minver}
@@ -47,7 +48,9 @@
# Do not use -b option, or we'll install the backup too
%patch0 -p1 -b .config
rm -f skel/etc/zope.conf.in.config
+chmod -x skel/import/README.txt
cp -p %{SOURCE4} README.Fedora
+cp -p %{SOURCE5} skel/etc/logrotate.conf.in
%build
@@ -75,6 +78,7 @@
install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/zope
install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope
install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/zopectl
+install -D -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/zope-logrotate
perl -pi -e 's,<<SYSCONFDIR>>,%{_sysconfdir},g;
s,<<BINDIR>>,%{_bindir},g;
s,<<LOCALSTATEDIR>>,%{_localstatedir},g;
@@ -82,12 +86,13 @@
$RPM_BUILD_ROOT%{_initrddir}/zope \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope \
$RPM_BUILD_ROOT%{_bindir}/zopectl \
+ $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/zope-logrotate \
README.Fedora skel/etc/zope.conf.in
# Install the skel, translating paths, into the build root
%{__python} "utilities/copyzopeskel.py" \
--sourcedir="skel" \
- --targetdir="$RPM_BUILD_ROOT%{_localstatedir}/lib/zope" \
+ --targetdir="$RPM_BUILD_ROOT%{instance_home}" \
--replace="INSTANCE_HOME:%{instance_home}" \
--replace="SOFTWARE_HOME:%{software_home}" \
--replace="ZOPE_HOME:%{zope_home}" \
@@ -96,7 +101,8 @@
# Actually copy all the other files over
make install
-chmod 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/zope
+chmod 700 $RPM_BUILD_ROOT%{instance_home}
+chmod 755 $RPM_BUILD_ROOT%{zope_home}
# Symlink to include in the docs
ln -sf %{zope_home}/doc docs
@@ -110,6 +116,8 @@
compileall.compile_dir(\"$RPM_BUILD_ROOT%{zope_home}\", \
ddir=\"%{zope_home}\", force=1)"
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -137,18 +145,50 @@
fi
+
%files
%defattr(-, root, root, -)
+%doc %{zope_home}/doc
%doc docs README.Fedora
%config(noreplace) %{_sysconfdir}/sysconfig/zope
%config %{_initrddir}/zope
+%config %{_sysconfdir}/cron.daily/zope-logrotate
%attr(0755, root, root) %{_bindir}/zopectl
-%{zope_home}
-%attr(-, %{zope_user}, %{zope_group}) %verify(not md5 size mtime) %{instance_home}
+%dir %{zope_home}
+%{zope_home}/bin
+%{zope_home}/import
+%{zope_home}/lib
+%dir %{zope_home}/skel
+%{zope_home}/skel/bin
+%{zope_home}/skel/Extensions
+%{zope_home}/skel/import
+%{zope_home}/skel/log
+%{zope_home}/skel/Products
+%{zope_home}/skel/README.txt
+%{zope_home}/skel/var
+%config %{zope_home}/skel/etc
+%attr(-, %{zope_user}, %{zope_group}) %dir %{instance_home}
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/bin
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Extensions
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/import
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/log
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Products
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var
+%attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc
+
%changelog
-* Fri Dec 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-6
+* Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-1
+- version 2.7.4
+- flag the documentation as %%doc
+- make %%zope_home go+rx to allow users to create instances and to allow
+ access to docs
+- add a logrotate cron job
+- flag config files as %%config even in %%zope_home and %%instance_home
+
+* Fri Dec 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.6
- activate "security-policy-implementation python" in zope.conf
* Sun Nov 21 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.5
18 years
rpms/zope import.log,1.2,1.3
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/zope
In directory cvs.fedora.redhat.com:/tmp/cvs-serv16501
Modified Files:
import.log
Log Message:
auto-import zope-2.7.4-1 on branch devel from zope-2.7.4-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zope/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log 9 Jan 2005 12:09:24 -0000 1.2
+++ import.log 29 Jan 2005 22:57:17 -0000 1.3
@@ -1 +1,2 @@
zope-2_7_3-6:HEAD:zope-2.7.3-6.src.rpm:1105272558
+zope-2_7_4-1:HEAD:zope-2.7.4-1.src.rpm:1107039430
18 years
rpms/imlib2/FC-2 imlib2-1.2.0-configure-xlib64.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 imlib2.spec, 1.5, 1.6 sources, 1.3, 1.4
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/imlib2/FC-2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv16304/FC-2
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.2 on branch FC-2 from imlib2-1.2.0-0.fdr.4.2.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-2/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 04:35:58 -0000 1.3
+++ .cvsignore 29 Jan 2005 22:23:59 -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-2/imlib2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- imlib2.spec 8 Nov 2004 04:35:58 -0000 1.5
+++ imlib2.spec 29 Jan 2005 22:23:59 -0000 1.6
@@ -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.2
+Version: 1.2.0
+Release: 0.fdr.4.2
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-2/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 04:35:58 -0000 1.3
+++ sources 29 Jan 2005 22:23:59 -0000 1.4
@@ -1 +1 @@
-3389bad516032c951fda4fe620df0cef imlib2-1.1.2.tar.gz
+853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz
18 years
rpms/imlib2 import.log,1.8,1.9
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/rpms/imlib2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv16304
Modified Files:
import.log
Log Message:
auto-import imlib2-1.2.0-0.fdr.4.2 on branch FC-2 from imlib2-1.2.0-0.fdr.4.2.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/imlib2/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log 29 Jan 2005 22:23:12 -0000 1.8
+++ import.log 29 Jan 2005 22:23:59 -0000 1.9
@@ -5,3 +5,4 @@
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
+imlib2-1_2_0-0_fdr_4_2:FC-2:imlib2-1.2.0-0.fdr.4.2.src.rpm:1107037432
18 years