rpms/utrac/devel utrac-destdir.patch, NONE, 1.1 utrac.h.utf8, NONE, 1.1 utrac.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tue Sep 27 13:44:37 UTC 2005

Author: Dionysos

Update of /cvs/extras/rpms/utrac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20430/devel

Modified Files:
	.cvsignore sources 
Added Files:
	utrac-destdir.patch utrac.h.utf8 utrac.spec 
Log Message:
auto-import utrac-0.3.0-4 on branch devel from utrac-0.3.0-4.src.rpm

utrac-destdir.patch:

--- NEW FILE utrac-destdir.patch ---
--- Makefile	2005-02-25 18:07:49.000000000 +0100
+++ Makefile.Fedora	2005-09-27 10:35:42.000000000 +0200
@@ -49,23 +49,26 @@
 #### INSTALL / UNINSTALL ######	
 install: utrac
 	strip ./utrac
-	mkdir -p ${BIN_PATH}
-	cp ./utrac ${BIN_PATH}
-	mkdir -p ${SHARE_PATH}
-	cp -f ${CHARMAPS_FILE} ${SHARE_PATH}
-	cp -f utrac.1 ${MAN_PATH}
+	mkdir -p $(DESTDIR)${BIN_PATH}
+	cp ./utrac $(DESTDIR)${BIN_PATH}
+	mkdir -p $(DESTDIR)${SHARE_PATH}
+	cp -f ${CHARMAPS_FILE} $(DESTDIR)${SHARE_PATH}
+	mkdir -p $(DESTDIR)${MAN_PATH}
+	cp -f utrac.1 $(DESTDIR)${MAN_PATH}
 
 install-lib: lib
-	mkdir -p ${LIB_PATH}
-	cp libutrac.a ${LIB_PATH}
-	mkdir -p ${LIB_PATH}
-	cp libutrac.a ${LIB_PATH}
-	
+	mkdir -p $(DESTDIR)${LIB_PATH}
+	cp libutrac.a $(DESTDIR)${LIB_PATH}
+	mkdir -p $(DESTDIR)${LIB_PATH}
+	cp libutrac.a $(DESTDIR)${LIB_PATH}
+	mkdir -p $(DESTDIR)${INC_PATH}
+	cp -f utrac.h $(DESTDIR)${INC_PATH}
+
 uninstall:
-	rm -f ${BIN_PATH}/utrac
-	rm -f ${LIB_PATH}/libutrac.a
-	rm -f ${SHARE_PATH}/${CHARMAPS_FILE}
-	rmdir ${SHARE_PATH}
+	rm -f $(DESTDIR)${BIN_PATH}/utrac
+	rm -f $(DESTDIR)${LIB_PATH}/libutrac.a
+	rm -f $(DESTDIR)${SHARE_PATH}/${CHARMAPS_FILE}
+	rmdir $(DESTDIR)${SHARE_PATH}
 
 ###### OBJECT FILES #########
 utrac_cmd.o: utrac_cmd.c utrac.h ut_charset.h ut_error.h ut_text.h
@@ -85,7 +88,7 @@
 
 #option -Wno-multichar has no effect! (gcc 3.3.4) so we use -w...
 ut_charset.o: ut_charset.c utrac.h ut_charset.h ut_error.h
-	$(CC) -w -Wno-multichar -c $(CFLAGS) -DUT_CHARMAPS_FILENAME='"${SHARE_PATH}/${CHARMAPS_FILE}"' $< -o $@
+	$(CC) -w -Wno-multichar -c $(CFLAGS) -DUT_CHARMAPS_FILENAME='"$(DESTDIR)${SHARE_PATH}/${CHARMAPS_FILE}"' $< -o $@
 
 ut_utils.o: ut_utils.c ut_error.h utrac.h
 	$(CC) -c $(CFLAGS) $< -o $@


--- NEW FILE utrac.h.utf8 ---
--- utrac-0.2/utrac.h.old	2004-12-02 17:56:01.000000000 +0100
+++ utrac-0.2/utrac.h	2004-12-15 15:45:40.415374016 +0100
@@ -71,7 +71,7 @@
 //const char * UT_CHARMAPS_FILENAME2 = "/home/antoine/dev/utrac/charsets.dat";
 //UT_CHARMAPS_FILENAME should be set with "gcc -D ..."
 const char * UT_CHARMAPS_FILENAME2 = "charsets.dat";
-const char * UT_DEFAULT_ENCODING_UNIX = "ISO-8859-1";
+const char * UT_DEFAULT_ENCODING_UNIX = "UTF-8";
 #else
 //! Language and system coeficients applied to charset rating, depending on language or system selected.
 extern const float UT_LANG_SYS_COEF [];


--- NEW FILE utrac.spec ---
Name: 		utrac
Version:	0.3.0
Release:	4%{?dist}
Summary: 	Universal Text Recognizer and Converter
Summary(fr): 	Reconnaisseur et convertisseur universel de texte

Group: 		Applications/File
License: 	GPL
Url: 		http://utrac.sourceforge.net
Source:		http://utrac.sourceforge.net/download/utrac-0.3.0.tar.gz
Patch0:		utrac-destdir.patch
Patch1:		utrac.h.utf8
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Utrac is a command line tool and a library that recognize the encoding
of an input file (ex: UTF-8, ISO-8859-1, CP437...) and its end-of-line
type (CR, LF, CRLF).
It has three main features:
- Automatic recognition (depending on the file and on the system's locale),
  reliable in most cases;
- Assistance for verification or manual recognition;
- Conversion to an other charset and/or end-of-line type.

%description -l fr
Utrac est un outil en ligne de commande et une bibliothÃ¨que qui reconnait
l'encodage d'un fichier d'entrÃ©e (par ex: UTF-8, ISO-8859-1, CP437...) et son
type de fin de ligne (CR, LF, CRLF).
Ses trois fonctionnalitÃ©s principales sont :
- reconnaissance automatique (suivant le fichier et la localisation du
  systÃ¨me) fiable dans la plupart des cas ;
- assistance Ã  la vÃ©rification ou Ã  la reconnaissance manuelle ;
- conversion dans un autre jeu de caractÃ¨res et/ou type de fin de ligne.

%package	devel
Summary:	Library and file header for utrac
Summary(fr):	BibliothÃ¨que et fichier d'en-tÃªtes pour utrac
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
The %{name}-devel package includes the static library and the header files
for compiling programs that use the utrac library.

%description -l fr devel
Le paquetage %{name}-devel contient la bibliothÃ¨que statique et le fichier
d'en-tÃªtes nÃ©cessaires Ã  la compilation des programmes qui utilisent la
bibliothÃ¨que utrac.

%prep
%setup -q
%patch0
%patch1 -p1

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT \
             PREFIX_PATH=%{_prefix} \
             BIN_PATH=%{_bindir} \
             LIB_PATH=%{_libdir} \
             INC_PATH=%{_includedir} \
             MAN_PATH=%{_mandir}/man1 \
             SHARE_PATH=%{_datadir}/%{name}
make install-lib DESTDIR=$RPM_BUILD_ROOT \
             PREFIX_PATH=%{_prefix} \
             BIN_PATH=%{_bindir} \
             LIB_PATH=%{_libdir} \
             INC_PATH=%{_includedir} \
             MAN_PATH=%{_mandir}/man1 \
             SHARE_PATH=%{_datadir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc CHANGES COPYING README TODO
%{_bindir}/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.a
%{_includedir}/*

%changelog
* Tue Sep 27 2005 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.3.0-4
  - Change Source tag to allow direct download

* Tue Sep 27 2005 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.3.0-3
  - Change Source tag to allow direct download
  - Update and rename Makefile patch
  - Override utrac variables in install section
  - Add "-l fr" forgotten option in french description
  - Remove "rm -rf $RPM_BUILD_DIR/%{name}-%{version}" statement in %clean section
  - Remove useless INSTALL file
  - Package don't own /usr/share/man/man1
  - Contribution of AurÃ©lien Bompard <gauret[AT]free[DOT]fr>
    Thanks to him

* Tue Sep 13 2005 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.3.0-2
  - Add french summary and description

* Mon Sep 12 2005 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.3.0-1
  - New version
  - Patch0 to easy installation
  - Patch1 to set default encoding recognition as utf8

* Thu Jan 20 2005 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:0.2-0.fdr.1
  - Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/utrac/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2005 13:43:57 -0000	1.1
+++ .cvsignore	27 Sep 2005 13:44:34 -0000	1.2
@@ -0,0 +1 @@
+utrac-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/utrac/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2005 13:43:57 -0000	1.1
+++ sources	27 Sep 2005 13:44:34 -0000	1.2
@@ -0,0 +1 @@
+0b70a94e450d428bc49d499110052ae6  utrac-0.3.0.tar.gz


