Browse Source

update: fprintd, fprint_demo, t1lib

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3886 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 13 years ago
parent
commit
fd37092cb3
3 changed files with 57 additions and 49 deletions
  1. 12 6
      f/fprint_demo/fprint_demo-vl.spec
  2. 8 3
      f/fprintd/fprintd-vl.spec
  3. 37 40
      t/t1lib/t1lib-vl.spec

+ 12 - 6
f/fprint_demo/fprint_demo-vl.spec

@@ -2,17 +2,21 @@ Summary:        Demo of the fprint drivers
 Summary(ja):    fprint ドライバのデモプログラム
 Name:           fprint_demo
 Version:        0.4
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://www.reactivated.net/fprint/wiki/Main_Page
+
 Source0:        http://downloads.sourceforge.net/fprint/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Source2:        fprint-icon.png
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  fprintd-devel libfprint-devel gtk2-devel desktop-file-utils
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  fprintd-devel
+BuildRequires:  libfprint-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  desktop-file-utils
 Requires:	fprintd-pam
 
 %description
@@ -33,12 +37,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 install -Dm 0755 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/fprint-icon.png
 
-desktop-file-install    --vendor="fedora"                               \
+desktop-file-install    --vendor="vine"                               \
                         --dir=%{buildroot}%{_datadir}/applications/     \
                         --mode 0644                                     \
                         %{SOURCE1}  
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -47,10 +50,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc INSTALL COPYING AUTHORS NEWS README 
 %{_bindir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/fprint-icon.png
 
 %changelog
+* Tue May  3 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 	0.4-2
+- rebuilt with current VineSeed
+
 * Wed May 13 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.4-1
 - new versioning policy
 

+ 8 - 3
f/fprintd/fprintd-vl.spec

@@ -5,7 +5,7 @@ Summary:	D-Bus service for Fingerprint reader access
 Summary(ja):	指紋リーダにアクセスするための D-Bus サービス
 Name:		fprintd
 Version:	0.1
-Release:	1.git%{short_hash}%{?_dist_release}
+Release:	2.git%{short_hash}%{?_dist_release}
 
 Group:		System Environment/Daemons
 License:	GPLv2+
@@ -14,12 +14,14 @@ License:	GPLv2+
 # git reset --hard %{long_hash}
 # ./autogen.sh && make distcheck
 # mv fprintd-0.1.tar.bz2 fprintd-0.1-%{short_hash}.tar.bz2
+URL:		http://www.reactivated.net/fprint/wiki/Fprintd
+
 Source0:	fprintd-0.1-%{short_hash}.tar.bz2
 # FIXME remove when we have a newer libfprint
 Patch0:		old-libfprint.patch
 Patch1:		0001-Detect-when-a-device-is-disconnected.patch
-Url:		http://www.reactivated.net/fprint/wiki/Fprintd
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:	dbus-glib-devel
 BuildRequires:	pam-devel
@@ -96,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
 
 %changelog
+* Tue May  3 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 	0.1-2.git04fd09cfa
+- rebuilt with current VineSeed
+
 * Wed May 13 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 	0.1-1.git04fd09cfa
 - initial build for Vine Linux
 

+ 37 - 40
t/t1lib/t1lib-vl.spec

@@ -1,21 +1,17 @@
-%define name	t1lib
-%define version	5.0.2
-%define release	3%{?_dist_release}
-
-Summary:	Type 1 font rasterizer
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Summary:	PostScript Type 1 font rasterizer
+Name:		t1lib
+Version:	5.1.2
+Release:	1%{?_dist_release}
 Epoch: 		1
 
 Group:		System Environment/Libraries
-License:	LGPL
-URL:		http://freshmeat.net/projects/t1lib
+License:	LGPLv2+
+URL:            ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-%{version}.lsm
 
 Source:		ftp://sunsite.unc.edu/pub/Linux/libs/graphics/%{name}-%{version}.tar.gz
-Patch0:         %{name}-DESTDIR.patch
 Patch1:		%{name}-doc.patch.bz2
 Patch2:         %{name}-config.patch.bz2
+Patch3:         %{name}-5.1.2-segf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	libICE-devel libX11-devel libXaw-devel libXpm-devel
@@ -29,9 +25,9 @@ of the rasterizer being included in X11 have been eliminated.
 T1lib also includes a support for antialiasing.
 
 %package devel
-Summary: 	Header files for Type 1 font rasterizer
+Summary: 	Header files for PostScript Type 1 font rasterizer
 Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}
+Requires: 	%{name} = %{epoch}:%{version}-%{release}
 Provides: 	%{name}-devel = %{version}-%{release}
 
 %description devel
@@ -39,7 +35,7 @@ Header files required for compiling packages
 needing the t1lib.
 
 %package static-devel
-Summary:        Static libraries for Type 1 font rasterizer
+Summary:        Static libraries for PostScript Type 1 font rasterizer
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{epoch}:%{version}-%{release}
 Provides:       %{name}-static-devel = %{version}-%{release}
@@ -50,7 +46,7 @@ Static libraries required for staticaly compiling packages needing the t1lib.
 %package progs
 Summary: 	Programs dor manipulating Type 1 font
 Group: 		Applications/Graphics
-License: 	GPL
+License: 	GPLv2+
 Requires: 	%{name} = %{epoch}:%{version}
 Provides: 	%{name}-progs
 
@@ -59,21 +55,28 @@ The t1lib-progs contains the programs "xglyph" and "type1afm"
 It also contains the "t1libconfig" script used to configure t1lib.
 
 %prep
-rm -rf %buildroot
-
 %setup -q
-%patch0 -p1
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1 -b .segf
+
+iconv -f latin1 -t utf8 < Changes > Changes.utf8
+touch -r Changes Changes.utf8
+mv Changes.utf8 Changes
 
 %build
 %configure
-export tagname=CC
+#export tagname=CC
 perl -pi -e 's,-DGLOBAL_CONFIG_DIR="\\"/usr/share/t1lib\\"",-DGLOBAL_CONFIG_DIR="\\"/etc/t1lib\\"",;' Makefile
-(cd lib
-perl -pi -e 's,$(DESTDIR)/usr/share/t1lib,$(DESTDIR)$(datedir)t1lib,;' Makefile
-)
-make without_doc LIBTOOL=/usr/bin/libtool
+#(cd lib
+#perl -pi -e 's,$(DESTDIR)/usr/share/t1lib,$(DESTDIR)$(datedir)t1lib,;' Makefile
+#)
+make without_doc 
+#LIBTOOL=/usr/bin/libtool
+touch -r lib/t1lib/t1lib.h.in lib/t1lib.h
+touch -r lib/t1lib/t1libx.h lib/t1libx.h
+ln README.t1lib-%{version} README
+
 (cd doc
 make clean
 make pdf)
@@ -84,25 +87,16 @@ install -d $RPM_BUILD_ROOT%{_libdir} \
 	$RPM_BUILD_ROOT%{_datadir} \
 	$RPM_BUILD_ROOT%{_bindir} \
         $RPM_BUILD_ROOT%{_includedir}
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
-export tagname=CC
-%makeinstall DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
+rm -f $RPM_BUILD_ROOT%{_libdir}/libt1*.la
+chmod a+x $RPM_BUILD_ROOT%{_libdir}/libt1*.so.*
 
-#rm -rf %buildroot/%{_datadir}/t1lib/doc
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/t1lib
 mv $RPM_BUILD_ROOT%{_datadir}/t1lib/t1lib.config $RPM_BUILD_ROOT%{_sysconfdir}/t1lib
 
-%ifarch alpha
-(cd $RPM_BUILD_ROOT%{_libdir}
-ln -sf libt1.so libt1.so.0)
-%endif
-
-## remove unuse files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
-
-
-%post 	-n %{name} -p /sbin/ldconfig
-%postun -n %{name} -p /sbin/ldconfig
+%post 	-p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -112,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/t1lib/t1lib.config
 %doc Changes LGPL README.t1*
-%attr(755,root,root) %{_libdir}/libt1*.so.*
+%{_libdir}/libt1*.so.*
 
 %files -n %{name}-devel
 %defattr(-,root,root)
@@ -124,14 +118,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc LGPL
 %{_libdir}/*.a
-#%{_libdir}/*.la
 
 %files -n %{name}-progs
 %defattr(-,root,root)
 %doc LICENSE README.t1python
-%attr(755,root,root) %{_bindir}/*
+%{_bindir}/*
 
 %changelog
+* Sun May 15 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 5.1.2-1
+- updated to 5.1.2
+- added Patch3 from Fedora
+
 * Mon Apr 25 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 5.0.2-3
 - rebuild with current VineSeed
 - use BR: texlive instead of tetex