rpms/poppler/devel .cvsignore, 1.38, 1.39 poppler.spec, 1.94, 1.95 sources, 1.42, 1.43
Rex Dieter
rdieter at fedoraproject.org
Wed Jun 24 01:49:00 UTC 2009
- Previous message (by thread): rpms/gwibber/F-10 .cvsignore, 1.15, 1.16 gwibber.spec, 1.19, 1.20 import.log, 1.15, 1.16 sources, 1.15, 1.16
- Next message (by thread): rpms/barry/F-10 .cvsignore, 1.3, 1.4 barry.desktop, 1.1, 1.2 barry.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13993
Modified Files:
.cvsignore poppler.spec sources
Log Message:
* Tue Jun 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11.1-2
- omit poppler-data (#507675)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore 23 Jun 2009 18:43:44 -0000 1.38
+++ .cvsignore 24 Jun 2009 01:48:30 -0000 1.39
@@ -1,2 +1 @@
-poppler-data-0.2.1.tar.gz
poppler-0.11.1.tar.gz
Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- poppler.spec 23 Jun 2009 18:43:45 -0000 1.94
+++ poppler.spec 24 Jun 2009 01:48:30 -0000 1.95
@@ -1,4 +1,3 @@
-%define dataversion 0.2.1
Summary: PDF rendering library
Name: poppler
@@ -10,7 +9,6 @@ License: GPLv2 and Redistributable, no m
Group: Development/Libraries
URL: http://poppler.freedesktop.org/
Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
-Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz
# for texlive/pdftex, TODO: upstream
Patch0: poppler-ObjStream.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -109,16 +107,15 @@ This utils package installs a number of
converting PDF files to a number of other formats.
%prep
-%setup -c -q -a1
-pushd %{name}-%{version}
+%setup -q
+
%patch0 -p0 -b .objstream
%patch50 -p1 -b .pkg_config
# hammer to nuke rpaths, recheck on new releases
autoreconf -i -f
-popd
+
%build
-pushd %{name}-%{version}
# can use in a pinch, but isn't necessary (in general) -- Rex
unset QTDIR && . /etc/profile.d/qt.sh
%configure \
@@ -132,18 +129,11 @@ unset QTDIR && . /etc/profile.d/qt.sh
--disable-zlib
make %{?_smp_mflags}
-popd
-pushd poppler-data-%{dataversion}
-cp COPYING COPYING-poppler-data
-cp README README-poppler-data
-popd
%install
rm -rf $RPM_BUILD_ROOT
-make -C %{name}-%{version} DESTDIR=$RPM_BUILD_ROOT install
-make -C %{name}-data-%{dataversion} \
- DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} install
+make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
@@ -171,16 +161,11 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc %{name}-%{version}/README
-%doc %{name}-%{version}/COPYING
-%doc poppler-data-%{dataversion}/README-poppler-data
-%doc poppler-data-%{dataversion}/COPYING-poppler-data
+%doc COPYING README
%{_libdir}/libpoppler.so.5*
-%{_datadir}/poppler/
%files devel
%defattr(-,root,root,-)
-%exclude %{_libdir}/pkgconfig/poppler-qt.pc
%{_libdir}/pkgconfig/poppler.pc
%{_libdir}/pkgconfig/poppler-splash.pc
%{_libdir}/libpoppler.so
@@ -223,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jun 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11.1-2
+- omit poppler-data (#507675)
+
* Tue Jun 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11.1-1
- poppler-0.11.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources 23 Jun 2009 18:43:45 -0000 1.42
+++ sources 24 Jun 2009 01:48:30 -0000 1.43
@@ -1,2 +1 @@
-bca78b8786746c7b48b324283992d658 poppler-data-0.2.1.tar.gz
2c6aadf4c3c2d21da71239fa924db77d poppler-0.11.1.tar.gz
- Previous message (by thread): rpms/gwibber/F-10 .cvsignore, 1.15, 1.16 gwibber.spec, 1.19, 1.20 import.log, 1.15, 1.16 sources, 1.15, 1.16
- Next message (by thread): rpms/barry/F-10 .cvsignore, 1.3, 1.4 barry.desktop, 1.1, 1.2 barry.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list