redhat files have been updated to permit an automatised packaging of ivy-c

with the rpmize tool

4 files changed, 45 insertions, 17 deletions

diff --git a/redhat/changelog b/redhat/changelog
index 8a79974..5347305 100644
--- a/redhat/changelog
+++ b/redhat/changelog
@@ -1,4 +1,4 @@
-$Version = "3.4";
+$Version = "3.6";
 $Release = 1;
 
 $ChangeLog = ' * Sat Feb 20 1999 Stéphane Chatty <chatty@cenatoulouse.dgac.fr>
@@ -58,4 +58,25 @@ $ChangeLog = ' * Sat Feb 20 1999 Stéphane Chatty <chatty@cenatoulouse.dgac.fr>
 -   * miminal support of glut toolkit, by frc. However, there is currently no
 -     libglutivy in the bin package due to some glut loop limitation.
 
+
+
+ * Thu, 24 Jun 2004 Yannick Jestin <jestin@cena.fr>
+-  Generation of version 3.6	
+-    * now uses PCRE ( Perl Compatible Regular Expressions ). Please use -livy -lpcre
+-      now when compiling. See http://www.pcre.org or man pcre for more details
+-    * tclivy.c : many bugfixes to support spaces in parameters captured by
+-      regexp
+-    * added an example directory, with gtk motif and tk bindings
+-    * fixed a nasty bug in the IvyUnbindMsg, where new client still were sent a
+-      binding to the unbound regexps
+-    * added a help message for ivyprobe, when called with -? or with unknown
+-      command line switches
+-    * added a -n switch to ivyprobe to change the name of the ivyprobe
+-    * added a -v switch to ivyprobe to check the ivy-c version
+-    * Makefile merges solaris, linux, and OSX versions. edit before compiling...
+
+ * Thu Sep 2 2004 Alexandre Bustico <bustico@cena.fr>
+- Generation of version 3.6-1
+- updates redhat files to coorect rules file for rpmize
+
 ';
diff --git a/redhat/files b/redhat/files
index d330e8f..eacd693 100644
--- a/redhat/files
+++ b/redhat/files
@@ -1,20 +1,18 @@
 /usr/bin/ivyprobe
 /usr/lib/libgivy.so
 /usr/lib/libgivy.so.3
-/usr/lib/libgivy.so.3.4
+/usr/lib/libgivy.so.3.6
 /usr/lib/libivy.so
 /usr/lib/libivy.so.3
-/usr/lib/libivy.so.3.4
+/usr/lib/libivy.so.3.6
 /usr/lib/libtclivy.so
-/usr/lib/libtclivy.so.3.4
+/usr/lib/libtclivy.so.3.6
 /usr/man/man1/ivyprobe.1
 /usr/X11R6/bin/ivygtkprobe
 /usr/X11R6/bin/ivyxtprobe
 /usr/X11R6/lib/libgtkivy.so
 /usr/X11R6/lib/libgtkivy.so.3
-/usr/X11R6/lib/libgtkivy.so.3.4
-/usr/X11R6/lib/libtclivy.so
-/usr/X11R6/lib/libtclivy.so.3
+/usr/X11R6/lib/libgtkivy.so.3.6
 /usr/X11R6/lib/libxtivy.so
 /usr/X11R6/lib/libxtivy.so.3
-/usr/X11R6/lib/libxtivy.so.3.4
+/usr/X11R6/lib/libxtivy.so.3.6
diff --git a/redhat/rules b/redhat/rules
index 8593c94..33e815c 100644
--- a/redhat/rules
+++ b/redhat/rules
@@ -5,10 +5,17 @@ $Vendor = "Centre d'Etudes de la Navigation Aerienne";
 $Distribution = "Toccata";
 $Group = "System Environment/Libraries";
 $Url = "http://www.tls.cena.fr/products/ivy";
-$BuildArchitectures = "i386";
-$FindFiles = "(find \$RPM_BUILD_ROOT -type f -print ; ".
-	"find \$RPM_BUILD_ROOT -type l -print) | sed \"s\@^\$RPM_BUILD_ROOT\@\@g\"".
-	"| sort | join redhat/files - ";
+$BuildArchitectures = "i586";
 $Description = "This is the C library that implements the
 connection to the Ivy software bus developed at CENA";
+$Requires = "ivy-c = \%{version}-\%{release} " .
+	"glibc libgtk+1.2 libglib2 libxfree86 tcl" ;
 
+
+$FindFiles = "(find \$RPM_BUILD_ROOT -type f -print ; find \$RPM_BUILD_ROOT -type l -print) | sed \"s\@^\$RPM_BUILD_ROOT\@\@g\" | sort | join redhat/files - ";
+
+$Install = "rm -Rf \$RPM_BUILD_ROOT
+cd src
+make PREFIX=\$RPM_BUILD_ROOT install
+cd ..
+(find \$RPM_BUILD_ROOT -type f -print; find \$RPM_BUILD_ROOT -type l -print) | sed \"s\@^\$RPM_BUILD_ROOT\@\@g\" | grep -v perllocal.pod | grep -v .packlist > $Name-\%{version}-filelist";
diff --git a/redhat/rules-devel b/redhat/rules-devel
index f79a983..2b25790 100644
--- a/redhat/rules-devel
+++ b/redhat/rules-devel
@@ -5,11 +5,13 @@ $Vendor = "Centre d'Etudes de la Navigation Aerienne";
 $Distribution = "Toccata";
 $Group = "Development/Libraries";
 $Url = "http://www.tls.cena.fr/divisions/PII/";
-$BuildArchitectures = "i386";
-$Requires = "ivy-c = \%{version}-\%{release}";
-$FindFiles = "(find \$RPM_BUILD_ROOT -type f -print ; ".
-	"find \$RPM_BUILD_ROOT -type l -print) | sed \"s\@^\$RPM_BUILD_ROOT\@\@g\"".
-	"| sort | join -v 2 redhat/files - ";
+$BuildArchitectures = "i586";
+$Requires = "ivy-c = \%{version}-\%{release} " .
+	"glibc-devel libgtk+1.2-devel libglib2-devel libxfree86-devel tcl-devel" ;
+
+undef $FindFiles;
+undef $Install ;
+
 $Description = "This contains the headers and static libraries necessary for
 developping and debugging applications that use the Ivy C library.";