rpms/libsilc/devel silc-toolkit-1.0.2-libs.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libsilc.spec, 1.10, 1.11 sources, 1.2, 1.3 silc-toolkit-0.9.12-libs.patch, 1.1, NONE silc-toolkit-0.9.12-optflags.patch, 1.1, NONE silc-toolkit-0.9.12-tutorial.patch, 1.1, NONE silc-toolkit-0.9.12-wordsize.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jun 28 17:19:33 UTC 2006 

Author: wtogami

Update of /cvs/dist/rpms/libsilc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12863/devel

Modified Files:
	.cvsignore libsilc.spec sources 
Added Files:
	silc-toolkit-1.0.2-libs.patch 
Removed Files:
	silc-toolkit-0.9.12-libs.patch 
	silc-toolkit-0.9.12-optflags.patch 
	silc-toolkit-0.9.12-tutorial.patch 
	silc-toolkit-0.9.12-wordsize.patch 
Log Message:
auto-import libsilc-1.0.2-1.fc6 on branch devel from libsilc-1.0.2-1.fc6.src.rpm

silc-toolkit-1.0.2-libs.patch:
 Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE silc-toolkit-1.0.2-libs.patch ---
--- silc-toolkit-1.0.2/lib/Makefile.in.lr	2005-12-22 10:27:53.000000000 -0500
+++ silc-toolkit-1.0.2/lib/Makefile.in	2005-12-22 10:28:58.000000000 -0500
@@ -668,10 +668,10 @@
 	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
 
 libsilc.a:
-	find $(SILCLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	-version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE)	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilc.la
+	find $(SILCLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	-version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE)	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -ldl -lpthread -o libsilc.la
 
 libsilcclient.a:
-	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	-version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE)	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilcclient.la
+	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	-version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE)	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -lsilc -lpthread -o libsilcclient.la
 
 toolkit-install:
 	-mkdir -p $(docdir)/toolkit/


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsilc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2004 07:42:40 -0000	1.2
+++ .cvsignore	28 Jun 2006 17:19:30 -0000	1.3
@@ -1 +1 @@
-silc-toolkit-0.9.12.tar.gz
+silc-toolkit-1.0.2.tar.bz2


Index: libsilc.spec
===================================================================
RCS file: /cvs/dist/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libsilc.spec	9 Jun 2006 03:35:59 -0000	1.10
+++ libsilc.spec	28 Jun 2006 17:19:30 -0000	1.11
@@ -1,15 +1,12 @@
 Summary: SILC Client Library
 Name: libsilc
-Version: 0.9.12
-Release: 12.2.1
+Version: 1.0.2
+Release: 1.fc6
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.silcnet.org/
-Source0: silc-toolkit-%{version}.tar.gz
-Patch: silc-toolkit-0.9.12-tutorial.patch
-Patch1: silc-toolkit-0.9.12-optflags.patch
-Patch2: silc-toolkit-0.9.12-libs.patch
-Patch3: silc-toolkit-0.9.12-wordsize.patch
+Source0: silc-toolkit-%{version}.tar.bz2
+Patch0: silc-toolkit-1.0.2-libs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Epoch: 0
 # doc subpackage was removed because they are too big and not useful
@@ -28,13 +25,10 @@
 
 %prep
 %setup -q -n silc-toolkit-%{version}
-%patch -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch0 -p1
 
 %build
-%configure --without-irssi --without-silcd --libdir=%{_libdir} --enable-shared \
+%configure --libdir=%{_libdir} --enable-shared \
            --includedir=%{_includedir}/silc --with-simdir=%{_libdir}/silc/modules \
            --with-docdir=%{_docdir}/%{name}-%{version} CFLAGS="$RPM_OPT_FLAGS"
 
@@ -52,23 +46,12 @@
 # remove files we don't want into the package, but are being installed to buildroot
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/silcalgs.conf $RPM_BUILD_ROOT%{_sysconfdir}/silcd.conf \
        $RPM_BUILD_ROOT%{_docdir} $RPM_BUILD_ROOT%{_mandir}
-# remove .la and .a files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-cat << EOF > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/silc.pc
-prefix=%{_prefix}
-exec_prefix=\${prefix}
-libdir=%{_libdir}
-includedir=%{_includedir}
- 
-Name: silc
-Version: 0.9.12
-Description: SILC library.
-Libs: -L\${libdir} -lsilcclient -lsilc
-Cflags: -I\${includedir}/silc
-EOF
+
+# remove .a and .la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libsilc.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/libsilc.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libsilcclient.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/libsilcclient.la
 
 %post -p /sbin/ldconfig
 
@@ -81,9 +64,9 @@
 %files
 %defattr(0755, root, root, 0755)
 %{_libdir}/libsilc-1.0.so.2
-%{_libdir}/libsilc-1.0.so.2.1.0
-%{_libdir}/libsilcclient-1.0.so.2
-%{_libdir}/libsilcclient-1.0.so.2.1.0
+%{_libdir}/libsilc-1.0.so.2.4.1
+%{_libdir}/libsilcclient-1.0.so.1
+%{_libdir}/libsilcclient-1.0.so.1.3.2
 %dir %_libdir/silc
 %dir %_libdir/silc/modules
 %{_libdir}/silc/modules/*.so
@@ -96,25 +79,16 @@
 %{_libdir}/libsilc.so
 %{_libdir}/libsilcclient.so
 %{_libdir}/pkgconfig/silc.pc
+%{_libdir}/pkgconfig/silcclient.pc
 %dir %_includedir/silc
 %{_includedir}/silc/*.h
 
 %changelog
-* Thu Jun 08 2006 Warren Togami <wtogami at redhat.com> -  0:0.9.12-13
-- prevent multilib -devel conflict (#192712)
+* Wed Jun 28 2006 Warren Togami <wtogami at redhat.com> 1.0.2-1
 - remove .a and .la files
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.9.12-12.2.1
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.9.12-12.2
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Sat Oct 15 2005 Florian La Roche <laroche at redhat.com>
-- link against dependent libs
+* Wed Dec 21 2005 Stu Tomlinson <stu at nosnilmot.com> 1.0.2-0
+- Update to 1.0.2
 
 * Sat Apr 9  2005 Stu Tomlinson <stu at nosnilmot.com>  0.9.12-11
 - use RPM_OPT_FLAGS (#153261)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsilc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 07:42:40 -0000	1.2
+++ sources	28 Jun 2006 17:19:30 -0000	1.3
@@ -1 +1 @@
-58e42d78b76e72cbf72cb52fcb32e83c  silc-toolkit-0.9.12.tar.gz
+869ce01349444a28fbace3c1bfe745ff  silc-toolkit-1.0.2.tar.bz2


--- silc-toolkit-0.9.12-libs.patch DELETED ---


--- silc-toolkit-0.9.12-optflags.patch DELETED ---


--- silc-toolkit-0.9.12-tutorial.patch DELETED ---


--- silc-toolkit-0.9.12-wordsize.patch DELETED ---

More information about the fedora-cvs-commits mailing list