rpms/libpaper/FC-4 libpaper.spec,1.1,1.2

Tom Callaway (spot) fedora-extras-commits at redhat.com
Sun Sep 24 01:04:32 UTC 2006


Author: spot

Update of /cvs/extras/rpms/libpaper/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10989/FC-4

Modified Files:
	libpaper.spec 
Log Message:

Fix all the remaining items in 207802.



Index: libpaper.spec
===================================================================
RCS file: /cvs/extras/rpms/libpaper/FC-4/libpaper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libpaper.spec	23 Sep 2006 16:19:12 -0000	1.1
+++ libpaper.spec	24 Sep 2006 01:04:31 -0000	1.2
@@ -1,13 +1,13 @@
 Name:		libpaper
 Version:	1.1.20
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Library and tools for handling papersize
 Group:		System Environment/Libraries
 License:	GPL
 URL:		http://packages.qa.debian.org/libp/libpaper.html
 Source0:	http://ftp.debian.org/debian/pool/main/libp/libpaper/%{name}_%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	automake
+BuildRequires:	automake, gettext
 
 %description
 The paper library and accompanying files are intended to provide a 
@@ -28,21 +28,27 @@
 
 %prep
 %setup -q
+cp debian/NEWS NEWS
 
 %build
-touch NEWS AUTHORS
+touch AUTHORS
+aclocal
 automake -a
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
-# letter is a sane default
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-echo "letter" > $RPM_BUILD_ROOT%{_sysconfdir}/papersize
+echo '# Simply write the paper name. See papersize(5) for possible values' > $RPM_BUILD_ROOT%{_sysconfdir}/papersize
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/libpaper.d
+for i in cs da de es fr gl hu it ja nl pt_BR sv tr uk vi; do
+	mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES/;
+	msgfmt debian/po/$i.po -o $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES/%{name}.mo;
+done
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,15 +57,15 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root, -)
-%doc COPYING ChangeLog README
+%doc COPYING ChangeLog NEWS README
 %config(noreplace) %{_sysconfdir}/papersize
+%dir %{_sysconfdir}/libpaper.d
 %{_bindir}/paperconf
 %{_libdir}/libpaper.so.*
 %{_sbindir}/paperconfig
 %{_mandir}/man1/*
-%{_mandir}/man3/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 
@@ -67,8 +73,18 @@
 %defattr(-, root, root, -)
 %{_includedir}/paper.h
 %{_libdir}/libpaper.so
+%{_mandir}/man3/*
 
 %changelog
+* Sat Sep 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.20-3
+- fix FC-4 with aclocal call
+- move man3 pages to -devel
+- don't set default, just put comment in conf file
+- own /etc/libpaper.d
+- use debian/NEWS
+- include the meager translations
+- use --disable-static
+
 * Sat Sep 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.20-2
 - nuke static lib
 - own /etc/papersize




More information about the scm-commits mailing list