scm-commits June 2008

scm-commits@lists.fedoraproject.org

1 participants
7609 discussions

rpms/opensm/devel opensm-3.2.1-rpath.patch, NONE, 1.1 opensm.conf, NONE, 1.1 opensm.initd, NONE, 1.1 opensm.logrotate, NONE, 1.1 opensm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by fedora-extras-commits＠redhat.com 01 Jul '08

01 Jul '08

Author: dledford Update of /cvs/extras/rpms/opensm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22772 Modified Files: .cvsignore sources Added Files: opensm-3.2.1-rpath.patch opensm.conf opensm.initd opensm.logrotate opensm.spec Log Message: * Sun Jun 08 2008 Doug Ledford <dledford(a)redhat.com> - 3.2.1-1 - Initial package for Fedora review process opensm-3.2.1-rpath.patch: --- NEW FILE opensm-3.2.1-rpath.patch --- --- opensm-3.2.1/libvendor/Makefile.am.rpath 2008-01-15 15:23:51.000000000 -0500 +++ opensm-3.2.1/libvendor/Makefile.am 2008-06-30 11:03:22.000000000 -0400 @@ -94,8 +94,8 @@ EXTRA_DIST = $(srcdir)/libosmvendor.map # name. What we can do it create a link to the installed file such # that it will mark it with an alias... # we find the new lib by traversing the links -install-exec-hook: - if test -L $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; fi; \ - lname=`\ls -l $(DESTDIR)/$(libdir)/libosmvendor.so | awk '{print $$NF}'`; \ - ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor_$(with_osmv).so; \ - ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so +#install-exec-hook: +# if test -L $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; fi; \ +# lname=`\ls -l $(DESTDIR)/$(libdir)/libosmvendor.so | awk '{print $$NF}'`; \ +# ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor_$(with_osmv).so; \ +# ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so --- opensm-3.2.1/opensm/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400 +++ opensm-3.2.1/opensm/Makefile.am 2008-06-30 11:11:40.000000000 -0400 @@ -79,7 +79,7 @@ endif if OSMV_SIM USEGPPLINK = $(LIBTOOL) --mode=link g++ $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ libopensm.la: $(libopensm_la_OBJECTS) $(libopensm_la_DEPENDENCIES) - $(USEGPPLINK) -rpath $(libdir) $(libopensm_la_LDFLAGS) $(libopensm_la_OBJECTS) $(libopensm_la_LIBADD) $(LIBS) + $(USEGPPLINK) $(libopensm_la_LDFLAGS) $(libopensm_la_OBJECTS) $(libopensm_la_LIBADD) $(LIBS) opensm$(EXEEXT): $(opensm_OBJECTS) $(opensm_DEPENDENCIES) @rm -f opensm$(EXEEXT) $(USEGPPLINK) $(opensm_LDFLAGS) $(opensm_OBJECTS) $(opensm_LDADD) $(LIBS) @@ -87,9 +87,9 @@ endif # we need to be able to load libraries from local build subtree before make install # we always give precedence to local tree libs and then use the pre-installed ones. -opensm_LDADD = -L../complib -L../libvendor -L. $(OSMV_LDADD) -lopensm -losmcomp -losmvendor +opensm_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor -L. -lopensm -opensm_LDFLAGS = -Wl,--rpath -Wl,$(libdir) -lpthread -ldl +opensm_LDFLAGS = -lpthread -ldl opensmincludedir = $(includedir)/infiniband/opensm @@ -124,10 +124,10 @@ EXTRA_DIST = $(srcdir)/libopensm.map $(s # name. What we can do it create a link to the installed file such # that it will mark it with an alias... # we find the new lib by traversing the links -install-exec-hook: - if test -L $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; fi; \ - lname=`\ls -l $(DESTDIR)/$(libdir)/libopensm.so | awk '{print $$NF}'`; \ - ln -s $$lname $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so +#install-exec-hook: +# if test -L $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; fi; \ +# lname=`\ls -l $(DESTDIR)/$(libdir)/libopensm.so | awk '{print $$NF}'`; \ +# ln -s $$lname $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so # generate c and h files from the lex and yacc files dist-hook: $(srcdir)/osm_qos_parser_y.c $(srcdir)/osm_qos_parser_l.c --- opensm-3.2.1/osmtest/Makefile.am.rpath 2008-03-12 17:43:17.000000000 -0400 +++ opensm-3.2.1/osmtest/Makefile.am 2008-06-30 11:03:22.000000000 -0400 @@ -18,10 +18,10 @@ osmtest_CFLAGS = -Wall $(OSMV_CFLAGS) -D else osmtest_CFLAGS = -Wall $(OSMV_CFLAGS) -DVENDOR_RMPP_SUPPORT $(DBGFLAGS) endif -osmtest_LDADD = -L../complib -L../libvendor -L../opensm -L$(libdir) -L. \ - $(OSMV_LDADD) -lopensm -losmcomp -losmvendor +osmtest_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor \ + -L../opensm -lopensm -osmtest_LDFLAGS = -Wl,--rpath -Wl,$(libdir) -lpthread -L../opensm +osmtest_LDFLAGS = -lpthread # for linking with the simulator client library we have to use g++: if OSMV_SIM USEGPPLINK = $(LIBTOOL) --mode=link g++ $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --- opensm-3.2.1/complib/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400 +++ opensm-3.2.1/complib/Makefile.am 2008-06-30 11:03:22.000000000 -0400 @@ -85,7 +85,7 @@ EXTRA_DIST = $(srcdir)/libosmcomp.map $( # name. What we can do it create a link to the installed file such # that it will mark it with an alias... # we find the new lib by traversing the links -install-exec-hook: - if test -L $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; fi; \ - lname=`\ls -l $(DESTDIR)/$(libdir)/libosmcomp.so | awk '{print $$NF}'`; \ - ln -s $$lname $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so +#install-exec-hook: +# if test -L $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; fi; \ +# lname=`\ls -l $(DESTDIR)/$(libdir)/libosmcomp.so | awk '{print $$NF}'`; \ +# ln -s $$lname $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so --- opensm-3.2.1/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400 +++ opensm-3.2.1/Makefile.am 2008-06-30 11:03:22.000000000 -0400 @@ -9,16 +9,16 @@ MAINTAINERCLEANFILES = Makefile.in acloc ACLOCAL = aclocal -I $(ac_aux_dir) # we should provide a hint for other apps about the build mode of this project -install-exec-hook: - mkdir -p $(DESTDIR)/$(includedir) -if DEBUG - echo "define osm_build_type \"debug\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h -else - echo "define osm_build_type \"free\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h -endif - $(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/init.d - cp $(top_builddir)/scripts/opensm.init $(DESTDIR)/$(sysconfdir)/init.d/opensmd - chmod 755 $(DESTDIR)/$(sysconfdir)/init.d/opensmd +#install-exec-hook: +# mkdir -p $(DESTDIR)/$(includedir) +#if DEBUG +# echo "define osm_build_type \"debug\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h +#else +# echo "define osm_build_type \"free\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h +#endif +# $(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/init.d +# cp $(top_builddir)/scripts/opensm.init $(DESTDIR)/$(sysconfdir)/init.d/opensmd +# chmod 755 $(DESTDIR)/$(sysconfdir)/init.d/opensmd man_MANS = man/opensm.8 man/osmtest.8 --- NEW FILE opensm.conf --- OPTIONS="-B" # DEBUG mode # This option specifies a debug option. # These options are not normally needed. # The number following -d selects the debug # option to enable as follows: # OPT Description # --- ----------------- # 0 - Ignore other SM nodes. # 1 - Force single threaded dispatching. # 2 - Force log flushing after each log message. # 3 - Disable multicast support. # 4 - Put OpenSM in memory tracking mode. # 10.. Put OpenSM in testability mode. # none, no debug options are enabled. # OPTIONS="$OPTIONS -d 1" # LMC # This option specifies the subnet's LMC value. # The number of LIDs assigned to each port is 2^LMC. # The LMC value must be in the range 0-7. # LMC values > 0 allow multiple paths between ports. # LMC values > 0 should only be used if the subnet # topology actually provides multiple paths between # ports, i.e. multiple interconnects between switches. # OpenSM defaults to LMC = 0, which allows # one path between any two ports. # OPTIONS="$OPTIONS -l 0" # MAXSMPS # This option specifies the number of VL15 SMP MADs # allowed on the wire at any one time. # Specifying -maxsmps 0 allows unlimited outstanding SMPs. # Without -maxsmps, OpenSM defaults to a maximum of # four outstanding SMP. OPTIONS="$OPTIONS -maxsmps 0" # REASSIGN_LIDS # This option causes OpenSM to reassign LIDs to all # end nodes. Specifying "REASSIGN_LIDS=yes" on a running subnet # may disrupt subnet traffic. # With "REASSIGN_LIDS=no", OpenSM attempts to preserve existing # LID assignments resolving multiple use of same LID. # OPTIONS="$OPTIONS -r" # SWEEP # This option specifies the number of seconds between # subnet sweeps. Specifying SWEEP=0 disables sweeping. # OpenSM defaults to a sweep interval of 10 seconds. # OPTIONS="$OPTIONS -s 10" # TIMEOUT # This option specifies the time in milliseconds # used for transaction timeouts. # Specifying -t 0 disables timeouts. # Without -t, OpenSM defaults to a timeout value of # 200 milliseconds. # OPTIONS="$OPTIONS -t 200" # OSM_LOG # This option defines the log to be the given file. # By default the log goes to /tmp/osm.log, which isn't very suitable # for a distribution, so we override it by default here. # For the log to go to standard output use OSM_LOG=stdout. OPTIONS="$OPTIONS -f /var/log/opensm.log" # QoS # This option enable QoS support in opensm # OPTIONS="$OPTIONS -Q" # QoS_POLICY # This option sets the file from which to load the QoS policy # OPTIONS="$OPTIONS -Y /etc/rdma/qos_policy" # VERBOSE # This option increases the log verbosity level. # The "-v" option may be specified multiple times # to further increase the verbosity level. # "-V" option sets the maximum verbosity level and # forces log flushing. # The "-V" is equivalent to "-vf 0xFF -d 2". # OPTIONS="$OPTIONS -v 0x00" # ROUTING_ENGINE # This option chooses the routing engine to use instead of the default # algorithm Min Hop # Supported engines are: updn, file, ftree, lash, dor # OPTIONS="$OPTIONS -R updn" # ROOT_GUID_FILE # This option only allowed when UPDN algorithm is activated # It specifies the guid list file from which to fetch the root node guid list # The file contain in each line only one valid guid # OPTIONS="$OPTIONS -a /etc/rdma/root_guids" # CN_GUID_FILE # This option only allowed when UPDN algorithm is activated # It specifies the guid list file from which to fetch the compute node # guid list # The file contain in each line only one valid guid # OPTIONS="$OPTIONS -u /etc/rdma/cn_guids" # GUID # This option specifies the local port GUID value # with which OpenSM should bind. OpenSM may be # bound to 1 port at a time. # If GUID given is 0, opensm would list the available guids and wait for # the user to select one (which obviously is no use in an init script) # Without -g, OpenSM trys to use the default port. # OPTIONS="$OPTIONS -g <guid in hex>" # PRIORITY # This option specifies the SM's PRIORITY. # This will effect the handover cases, where master # is chosen by priority and GUID. Range goes # from 0 (lowest priority) to 15 (highest). OPTIONS="$OPTIONS -p 15" # OSM_CACHE_DIR # There is no command line option to opensm to set this, it can only be set # as an environment variable. OSM_CACHE_DIR=/var/cache/opensm # CACHE_OPTIONS # Cache the given command line options into the file # OSM_CACHE_DIR/opensm.opts for use next invocation # Set to '--cache-options' or '-c' in order to enable # OPTIONS="$OPTIONS -c" --- NEW FILE opensm.initd --- #!/bin/bash # # Bring up/down opensm # # chkconfig: - 15 85 # description: Activates/Deactivates InfiniBand Subnet Manager # config: /etc/rdma/opensm.conf # ### BEGIN INIT INFO # Provides: opensm # Default-Stop: 0 1 2 3 4 5 6 # Required-Start: $rdma # Short-Description: Starts/Stops the InfiniBand Subnet Manager # Description: Starts/Stops the InfiniBand Subnet Manager ### END INIT INFO . /etc/rc.d/init.d/functions prog=/usr/sbin/opensm CONFIG=/etc/rdma/opensm.conf PID_FILE=/var/run/opensm.pid start() { local OSM_PID= if [ ! -f $CONFIG ]; then echo -n "Starting opensm: $CONFIG missing" echo_failure return 6 fi . $CONFIG [ -f /var/lock/subsys/opensm ] && return 0 # Start opensm echo -n "Starting IB Subnet Manager:" $prog $OPTIONS > /dev/null 2>&1 & OSM_PID=$! sleep 1 checkpid $OSM_PID RC=$? [ $RC -eq 0 ] && echo_success || echo_failure [ $RC -eq 0 ] && touch /var/lock/subsys/opensm [ $RC -eq 0 ] && echo $OSM_PID > $PID_FILE echo return $RC } stop() { [ -f /var/lock/subsys/opensm ] || return 0 echo -n "Stopping IB Subnet Manager." OSM_PID=`cat $PID_FILE` checkpid "$OSM_PID" RC=$? if [ $RC -ne 0 ]; then rm -f $PID_FILE rm -f /var/lock/subsys/opensm echo_success return 0 fi # Kill opensm kill -15 $OSM_PID > /dev/null 2>&1 cnt=0 while [ $cnt -lt 6 -a checkpid $OSM_PID -eq 0 ]; do echo -n "." sleep 1 let cnt++ done if [ checkpid $OSM_PID -eq 0 ]; then kill -KILL $OSM_PID > /dev/null 2>&1 echo -n "+" sleep 1 fi checkpid $pid DEAD=$? if [ $DEAD -eq 0 ]; then echo_failure echo return 1 fi echo_success echo # Remove pid file if any. rm -f $PID_FILE rm -f /var/lock/subsys/opensm return 0 } restart () { stop start } condrestart () { [ -f /var/lock/subsys/opensm ] && restart || return 0 } reload () { [ -f $PID_FILE ] || return 0 OSM_PID=`cat $PID_FILE` action $"Rescanning IB Subnet:" kill -HUP $OSM_PID return $? } usage () { echo echo "Usage: `basename $0` {start|stop|restart|condrestart|try-restart|force-reload|status}" echo return 2 } case $ACTION in start) start; RC=$? ;; stop) stop; RC=$? ;; restart) restart; RC=$? ;; reload) reload; RC=$? ;; condrestart) condrestart; RC=$? ;; try-restart) condrestart; RC=$? ;; force-reload) condrestart; RC=$? ;; status) status $prog; RC=$? ;; *) usage; RC=$? ;; esac exit $RC --- NEW FILE opensm.logrotate --- /var/log/opensm.log { missingok notifempty copytruncate weekly compress } --- NEW FILE opensm.spec --- Name: opensm Version: 3.2.1 Release: 1%{?dist} Summary: OpenIB InfiniBand Subnet Manager and management utilities Group: System Environment/Daemons License: GPLv2 or BSD Url: http://www.openfabrics.org/ Source0: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz Source1: opensm.conf Source2: opensm.logrotate Source3: opensm.initd Patch0: opensm-3.2.1-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libibmad-devel >= 1.2.0, libtool Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma %description OpenSM is the OpenIB project's Subnet Manager for Infiniband networks. The subnet manager is run as a system daemon on one of the machines in the infiniband fabric to manage the fabric's routing state. This package also contains various tools for diagnosing and testing Infiniband networks that can be used from any machine and do not need to be run on a machine running the opensm daemon. %package libs Summary: Libraries used by opensm and included utilities Group: System Environment/Libraries %description libs Shared libraries for Infiniband user space access %package devel Summary: Development files for the opensm-libs libraries Group: Development/System Requires: %{name}-libs = %{version}-%{release} %description devel Development environment for the opensm libraries %package static Summary: Static version of the opensm libraries Group: Development/System Requires: %{name}-devel = %{version}-%{release} %description static Static version of opensm libraries %prep %setup -q %patch0 -p1 -b .rpath ./autogen.sh %build %configure --with-opensm-conf-sub-dir=rdma make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rdma/opensm.conf install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/opensm install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/opensm mkdir -p ${RPM_BUILD_ROOT}/var/cache/opensm %clean rm -rf $RPM_BUILD_ROOT %post if [ $1 = 1 ]; then /sbin/chkconfig --add opensm else /sbin/service opensm condrestart fi %preun if [ $1 = 0 ]; then /sbin/service opensm stop /sbin/chkconfig --del opensm rm -f /var/cache/opensm/* fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %dir /var/cache/opensm %{_sbindir}/* %{_initrddir}/opensm %{_mandir}/man8/* %config(noreplace) %{_sysconfdir}/logrotate.d/opensm %config(noreplace) %{_sysconfdir}/rdma/opensm.conf %doc AUTHORS COPYING ChangeLog INSTALL README NEWS %files libs %defattr(-,root,root,-) %{_libdir}/lib*.so.* %files devel %defattr(-,root,root,-) %{_libdir}/lib*.so %{_includedir}/infiniband %files static %defattr(-,root,root,-) %{_libdir}/lib*.a %changelog * Sun Jun 08 2008 Doug Ledford <dledford(a)redhat.com> - 3.2.1-1 - Initial package for Fedora review process Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opensm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 20:02:44 -0000 1.1 +++ .cvsignore 30 Jun 2008 23:33:50 -0000 1.2 @@ -0,0 +1 @@ +opensm-3.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/opensm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 20:02:44 -0000 1.1 +++ sources 30 Jun 2008 23:33:50 -0000 1.2 @@ -0,0 +1 @@ +997d10f81896a0d70e0f21f0e78eca92 opensm-3.2.1.tar.gz

1 0

rpms/opensm/F-9 opensm-3.2.1-rpath.patch, NONE, 1.1 opensm.conf, NONE, 1.1 opensm.initd, NONE, 1.1 opensm.logrotate, NONE, 1.1 opensm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by fedora-extras-commits＠redhat.com 01 Jul '08

01 Jul '08

Author: dledford Update of /cvs/extras/rpms/opensm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22605 Modified Files: .cvsignore sources Added Files: opensm-3.2.1-rpath.patch opensm.conf opensm.initd opensm.logrotate opensm.spec Log Message: * Sun Jun 08 2008 Doug Ledford <dledford(a)redhat.com> - 3.2.1-1 - Initial package for Fedora review process opensm-3.2.1-rpath.patch: --- NEW FILE opensm-3.2.1-rpath.patch --- --- opensm-3.2.1/libvendor/Makefile.am.rpath 2008-01-15 15:23:51.000000000 -0500 +++ opensm-3.2.1/libvendor/Makefile.am 2008-06-30 11:03:22.000000000 -0400 @@ -94,8 +94,8 @@ EXTRA_DIST = $(srcdir)/libosmvendor.map # name. What we can do it create a link to the installed file such # that it will mark it with an alias... # we find the new lib by traversing the links -install-exec-hook: - if test -L $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; fi; \ - lname=`\ls -l $(DESTDIR)/$(libdir)/libosmvendor.so | awk '{print $$NF}'`; \ - ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor_$(with_osmv).so; \ - ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so +#install-exec-hook: +# if test -L $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; fi; \ +# lname=`\ls -l $(DESTDIR)/$(libdir)/libosmvendor.so | awk '{print $$NF}'`; \ +# ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor_$(with_osmv).so; \ +# ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so --- opensm-3.2.1/opensm/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400 +++ opensm-3.2.1/opensm/Makefile.am 2008-06-30 11:11:40.000000000 -0400 @@ -79,7 +79,7 @@ endif if OSMV_SIM USEGPPLINK = $(LIBTOOL) --mode=link g++ $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ libopensm.la: $(libopensm_la_OBJECTS) $(libopensm_la_DEPENDENCIES) - $(USEGPPLINK) -rpath $(libdir) $(libopensm_la_LDFLAGS) $(libopensm_la_OBJECTS) $(libopensm_la_LIBADD) $(LIBS) + $(USEGPPLINK) $(libopensm_la_LDFLAGS) $(libopensm_la_OBJECTS) $(libopensm_la_LIBADD) $(LIBS) opensm$(EXEEXT): $(opensm_OBJECTS) $(opensm_DEPENDENCIES) @rm -f opensm$(EXEEXT) $(USEGPPLINK) $(opensm_LDFLAGS) $(opensm_OBJECTS) $(opensm_LDADD) $(LIBS) @@ -87,9 +87,9 @@ endif # we need to be able to load libraries from local build subtree before make install # we always give precedence to local tree libs and then use the pre-installed ones. -opensm_LDADD = -L../complib -L../libvendor -L. $(OSMV_LDADD) -lopensm -losmcomp -losmvendor +opensm_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor -L. -lopensm -opensm_LDFLAGS = -Wl,--rpath -Wl,$(libdir) -lpthread -ldl +opensm_LDFLAGS = -lpthread -ldl opensmincludedir = $(includedir)/infiniband/opensm @@ -124,10 +124,10 @@ EXTRA_DIST = $(srcdir)/libopensm.map $(s # name. What we can do it create a link to the installed file such # that it will mark it with an alias... # we find the new lib by traversing the links -install-exec-hook: - if test -L $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; fi; \ - lname=`\ls -l $(DESTDIR)/$(libdir)/libopensm.so | awk '{print $$NF}'`; \ - ln -s $$lname $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so +#install-exec-hook: +# if test -L $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; fi; \ +# lname=`\ls -l $(DESTDIR)/$(libdir)/libopensm.so | awk '{print $$NF}'`; \ +# ln -s $$lname $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so # generate c and h files from the lex and yacc files dist-hook: $(srcdir)/osm_qos_parser_y.c $(srcdir)/osm_qos_parser_l.c --- opensm-3.2.1/osmtest/Makefile.am.rpath 2008-03-12 17:43:17.000000000 -0400 +++ opensm-3.2.1/osmtest/Makefile.am 2008-06-30 11:03:22.000000000 -0400 @@ -18,10 +18,10 @@ osmtest_CFLAGS = -Wall $(OSMV_CFLAGS) -D else osmtest_CFLAGS = -Wall $(OSMV_CFLAGS) -DVENDOR_RMPP_SUPPORT $(DBGFLAGS) endif -osmtest_LDADD = -L../complib -L../libvendor -L../opensm -L$(libdir) -L. \ - $(OSMV_LDADD) -lopensm -losmcomp -losmvendor +osmtest_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor \ + -L../opensm -lopensm -osmtest_LDFLAGS = -Wl,--rpath -Wl,$(libdir) -lpthread -L../opensm +osmtest_LDFLAGS = -lpthread # for linking with the simulator client library we have to use g++: if OSMV_SIM USEGPPLINK = $(LIBTOOL) --mode=link g++ $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --- opensm-3.2.1/complib/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400 +++ opensm-3.2.1/complib/Makefile.am 2008-06-30 11:03:22.000000000 -0400 @@ -85,7 +85,7 @@ EXTRA_DIST = $(srcdir)/libosmcomp.map $( # name. What we can do it create a link to the installed file such # that it will mark it with an alias... # we find the new lib by traversing the links -install-exec-hook: - if test -L $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; fi; \ - lname=`\ls -l $(DESTDIR)/$(libdir)/libosmcomp.so | awk '{print $$NF}'`; \ - ln -s $$lname $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so +#install-exec-hook: +# if test -L $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; fi; \ +# lname=`\ls -l $(DESTDIR)/$(libdir)/libosmcomp.so | awk '{print $$NF}'`; \ +# ln -s $$lname $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so --- opensm-3.2.1/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400 +++ opensm-3.2.1/Makefile.am 2008-06-30 11:03:22.000000000 -0400 @@ -9,16 +9,16 @@ MAINTAINERCLEANFILES = Makefile.in acloc ACLOCAL = aclocal -I $(ac_aux_dir) # we should provide a hint for other apps about the build mode of this project -install-exec-hook: - mkdir -p $(DESTDIR)/$(includedir) -if DEBUG - echo "define osm_build_type \"debug\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h -else - echo "define osm_build_type \"free\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h -endif - $(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/init.d - cp $(top_builddir)/scripts/opensm.init $(DESTDIR)/$(sysconfdir)/init.d/opensmd - chmod 755 $(DESTDIR)/$(sysconfdir)/init.d/opensmd +#install-exec-hook: +# mkdir -p $(DESTDIR)/$(includedir) +#if DEBUG +# echo "define osm_build_type \"debug\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h +#else +# echo "define osm_build_type \"free\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h +#endif +# $(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/init.d +# cp $(top_builddir)/scripts/opensm.init $(DESTDIR)/$(sysconfdir)/init.d/opensmd +# chmod 755 $(DESTDIR)/$(sysconfdir)/init.d/opensmd man_MANS = man/opensm.8 man/osmtest.8 --- NEW FILE opensm.conf --- OPTIONS="-B" # DEBUG mode # This option specifies a debug option. # These options are not normally needed. # The number following -d selects the debug # option to enable as follows: # OPT Description # --- ----------------- # 0 - Ignore other SM nodes. # 1 - Force single threaded dispatching. # 2 - Force log flushing after each log message. # 3 - Disable multicast support. # 4 - Put OpenSM in memory tracking mode. # 10.. Put OpenSM in testability mode. # none, no debug options are enabled. # OPTIONS="$OPTIONS -d 1" # LMC # This option specifies the subnet's LMC value. # The number of LIDs assigned to each port is 2^LMC. # The LMC value must be in the range 0-7. # LMC values > 0 allow multiple paths between ports. # LMC values > 0 should only be used if the subnet # topology actually provides multiple paths between # ports, i.e. multiple interconnects between switches. # OpenSM defaults to LMC = 0, which allows # one path between any two ports. # OPTIONS="$OPTIONS -l 0" # MAXSMPS # This option specifies the number of VL15 SMP MADs # allowed on the wire at any one time. # Specifying -maxsmps 0 allows unlimited outstanding SMPs. # Without -maxsmps, OpenSM defaults to a maximum of # four outstanding SMP. OPTIONS="$OPTIONS -maxsmps 0" # REASSIGN_LIDS # This option causes OpenSM to reassign LIDs to all # end nodes. Specifying "REASSIGN_LIDS=yes" on a running subnet # may disrupt subnet traffic. # With "REASSIGN_LIDS=no", OpenSM attempts to preserve existing # LID assignments resolving multiple use of same LID. # OPTIONS="$OPTIONS -r" # SWEEP # This option specifies the number of seconds between # subnet sweeps. Specifying SWEEP=0 disables sweeping. # OpenSM defaults to a sweep interval of 10 seconds. # OPTIONS="$OPTIONS -s 10" # TIMEOUT # This option specifies the time in milliseconds # used for transaction timeouts. # Specifying -t 0 disables timeouts. # Without -t, OpenSM defaults to a timeout value of # 200 milliseconds. # OPTIONS="$OPTIONS -t 200" # OSM_LOG # This option defines the log to be the given file. # By default the log goes to /tmp/osm.log, which isn't very suitable # for a distribution, so we override it by default here. # For the log to go to standard output use OSM_LOG=stdout. OPTIONS="$OPTIONS -f /var/log/opensm.log" # QoS # This option enable QoS support in opensm # OPTIONS="$OPTIONS -Q" # QoS_POLICY # This option sets the file from which to load the QoS policy # OPTIONS="$OPTIONS -Y /etc/rdma/qos_policy" # VERBOSE # This option increases the log verbosity level. # The "-v" option may be specified multiple times # to further increase the verbosity level. # "-V" option sets the maximum verbosity level and # forces log flushing. # The "-V" is equivalent to "-vf 0xFF -d 2". # OPTIONS="$OPTIONS -v 0x00" # ROUTING_ENGINE # This option chooses the routing engine to use instead of the default # algorithm Min Hop # Supported engines are: updn, file, ftree, lash, dor # OPTIONS="$OPTIONS -R updn" # ROOT_GUID_FILE # This option only allowed when UPDN algorithm is activated # It specifies the guid list file from which to fetch the root node guid list # The file contain in each line only one valid guid # OPTIONS="$OPTIONS -a /etc/rdma/root_guids" # CN_GUID_FILE # This option only allowed when UPDN algorithm is activated # It specifies the guid list file from which to fetch the compute node # guid list # The file contain in each line only one valid guid # OPTIONS="$OPTIONS -u /etc/rdma/cn_guids" # GUID # This option specifies the local port GUID value # with which OpenSM should bind. OpenSM may be # bound to 1 port at a time. # If GUID given is 0, opensm would list the available guids and wait for # the user to select one (which obviously is no use in an init script) # Without -g, OpenSM trys to use the default port. # OPTIONS="$OPTIONS -g <guid in hex>" # PRIORITY # This option specifies the SM's PRIORITY. # This will effect the handover cases, where master # is chosen by priority and GUID. Range goes # from 0 (lowest priority) to 15 (highest). OPTIONS="$OPTIONS -p 15" # OSM_CACHE_DIR # There is no command line option to opensm to set this, it can only be set # as an environment variable. OSM_CACHE_DIR=/var/cache/opensm # CACHE_OPTIONS # Cache the given command line options into the file # OSM_CACHE_DIR/opensm.opts for use next invocation # Set to '--cache-options' or '-c' in order to enable # OPTIONS="$OPTIONS -c" --- NEW FILE opensm.initd --- #!/bin/bash # # Bring up/down opensm # # chkconfig: - 15 85 # description: Activates/Deactivates InfiniBand Subnet Manager # config: /etc/rdma/opensm.conf # ### BEGIN INIT INFO # Provides: opensm # Default-Stop: 0 1 2 3 4 5 6 # Required-Start: $rdma # Short-Description: Starts/Stops the InfiniBand Subnet Manager # Description: Starts/Stops the InfiniBand Subnet Manager ### END INIT INFO . /etc/rc.d/init.d/functions prog=/usr/sbin/opensm CONFIG=/etc/rdma/opensm.conf PID_FILE=/var/run/opensm.pid start() { local OSM_PID= if [ ! -f $CONFIG ]; then echo -n "Starting opensm: $CONFIG missing" echo_failure return 6 fi . $CONFIG [ -f /var/lock/subsys/opensm ] && return 0 # Start opensm echo -n "Starting IB Subnet Manager:" $prog $OPTIONS > /dev/null 2>&1 & OSM_PID=$! sleep 1 checkpid $OSM_PID RC=$? [ $RC -eq 0 ] && echo_success || echo_failure [ $RC -eq 0 ] && touch /var/lock/subsys/opensm [ $RC -eq 0 ] && echo $OSM_PID > $PID_FILE echo return $RC } stop() { [ -f /var/lock/subsys/opensm ] || return 0 echo -n "Stopping IB Subnet Manager." OSM_PID=`cat $PID_FILE` checkpid "$OSM_PID" RC=$? if [ $RC -ne 0 ]; then rm -f $PID_FILE rm -f /var/lock/subsys/opensm echo_success return 0 fi # Kill opensm kill -15 $OSM_PID > /dev/null 2>&1 cnt=0 while [ $cnt -lt 6 -a checkpid $OSM_PID -eq 0 ]; do echo -n "." sleep 1 let cnt++ done if [ checkpid $OSM_PID -eq 0 ]; then kill -KILL $OSM_PID > /dev/null 2>&1 echo -n "+" sleep 1 fi checkpid $pid DEAD=$? if [ $DEAD -eq 0 ]; then echo_failure echo return 1 fi echo_success echo # Remove pid file if any. rm -f $PID_FILE rm -f /var/lock/subsys/opensm return 0 } restart () { stop start } condrestart () { [ -f /var/lock/subsys/opensm ] && restart || return 0 } reload () { [ -f $PID_FILE ] || return 0 OSM_PID=`cat $PID_FILE` action $"Rescanning IB Subnet:" kill -HUP $OSM_PID return $? } usage () { echo echo "Usage: `basename $0` {start|stop|restart|condrestart|try-restart|force-reload|status}" echo return 2 } case $ACTION in start) start; RC=$? ;; stop) stop; RC=$? ;; restart) restart; RC=$? ;; reload) reload; RC=$? ;; condrestart) condrestart; RC=$? ;; try-restart) condrestart; RC=$? ;; force-reload) condrestart; RC=$? ;; status) status $prog; RC=$? ;; *) usage; RC=$? ;; esac exit $RC --- NEW FILE opensm.logrotate --- /var/log/opensm.log { missingok notifempty copytruncate weekly compress } --- NEW FILE opensm.spec --- Name: opensm Version: 3.2.1 Release: 1%{?dist} Summary: OpenIB InfiniBand Subnet Manager and management utilities Group: System Environment/Daemons License: GPLv2 or BSD Url: http://www.openfabrics.org/ Source0: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz Source1: opensm.conf Source2: opensm.logrotate Source3: opensm.initd Patch0: opensm-3.2.1-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libibmad-devel >= 1.2.0, libtool Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma %description OpenSM is the OpenIB project's Subnet Manager for Infiniband networks. The subnet manager is run as a system daemon on one of the machines in the infiniband fabric to manage the fabric's routing state. This package also contains various tools for diagnosing and testing Infiniband networks that can be used from any machine and do not need to be run on a machine running the opensm daemon. %package libs Summary: Libraries used by opensm and included utilities Group: System Environment/Libraries %description libs Shared libraries for Infiniband user space access %package devel Summary: Development files for the opensm-libs libraries Group: Development/System Requires: %{name}-libs = %{version}-%{release} %description devel Development environment for the opensm libraries %package static Summary: Static version of the opensm libraries Group: Development/System Requires: %{name}-devel = %{version}-%{release} %description static Static version of opensm libraries %prep %setup -q %patch0 -p1 -b .rpath ./autogen.sh %build %configure --with-opensm-conf-sub-dir=rdma make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rdma/opensm.conf install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/opensm install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/opensm mkdir -p ${RPM_BUILD_ROOT}/var/cache/opensm %clean rm -rf $RPM_BUILD_ROOT %post if [ $1 = 1 ]; then /sbin/chkconfig --add opensm else /sbin/service opensm condrestart fi %preun if [ $1 = 0 ]; then /sbin/service opensm stop /sbin/chkconfig --del opensm rm -f /var/cache/opensm/* fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %dir /var/cache/opensm %{_sbindir}/* %{_initrddir}/opensm %{_mandir}/man8/* %config(noreplace) %{_sysconfdir}/logrotate.d/opensm %config(noreplace) %{_sysconfdir}/rdma/opensm.conf %doc AUTHORS COPYING ChangeLog INSTALL README NEWS %files libs %defattr(-,root,root,-) %{_libdir}/lib*.so.* %files devel %defattr(-,root,root,-) %{_libdir}/lib*.so %{_includedir}/infiniband %files static %defattr(-,root,root,-) %{_libdir}/lib*.a %changelog * Sun Jun 08 2008 Doug Ledford <dledford(a)redhat.com> - 3.2.1-1 - Initial package for Fedora review process Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opensm/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 20:02:44 -0000 1.1 +++ .cvsignore 30 Jun 2008 23:32:43 -0000 1.2 @@ -0,0 +1 @@ +opensm-3.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/opensm/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 20:02:44 -0000 1.1 +++ sources 30 Jun 2008 23:32:43 -0000 1.2 @@ -0,0 +1 @@ +997d10f81896a0d70e0f21f0e78eca92 opensm-3.2.1.tar.gz

1 0

rpms/python-kiwi/devel .cvsignore, 1.11, 1.12 python-kiwi.spec, 1.15, 1.16 sources, 1.11, 1.12
by fedora-extras-commits＠redhat.com 01 Jul '08

01 Jul '08

Author: icon Update of /cvs/pkgs/rpms/python-kiwi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22428/devel Modified Files: .cvsignore python-kiwi.spec sources Log Message: Upstream 1.9.22 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-kiwi/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 May 2008 18:42:23 -0000 1.11 +++ .cvsignore 30 Jun 2008 23:32:37 -0000 1.12 @@ -1 +1 @@ -kiwi-1.9.21.tar.gz +kiwi-1.9.22.tar.gz Index: python-kiwi.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-kiwi/devel/python-kiwi.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- python-kiwi.spec 10 May 2008 18:42:23 -0000 1.15 +++ python-kiwi.spec 30 Jun 2008 23:32:37 -0000 1.16 @@ -2,7 +2,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-kiwi -Version: 1.9.21 +Version: 1.9.22 Release: 1%{?dist} Summary: Framework for Python GUI applications @@ -94,6 +94,9 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev <icon(a)fedoraproject.org> - 1.9.22-1 +- Upstream 1.9.22 + * Sat May 10 2008 Konstantin Ryabitsev <icon(a)fedoraproject.org> - 1.9.21-1 - Upstream 1.9.21 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-kiwi/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 May 2008 18:42:23 -0000 1.11 +++ sources 30 Jun 2008 23:32:37 -0000 1.12 @@ -1 +1 @@ -4b283bcab44bacdee7311439269e87c4 kiwi-1.9.21.tar.gz +ba43354d11c6421da17197fd08e31870 kiwi-1.9.22.tar.gz

1 0

rpms/python-kiwi/F-9 .cvsignore, 1.11, 1.12 python-kiwi.spec, 1.15, 1.16 sources, 1.11, 1.12
by fedora-extras-commits＠redhat.com 01 Jul '08

01 Jul '08

Author: icon Update of /cvs/pkgs/rpms/python-kiwi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22428/F-9 Modified Files: .cvsignore python-kiwi.spec sources Log Message: Upstream 1.9.22 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-kiwi/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 May 2008 18:42:16 -0000 1.11 +++ .cvsignore 30 Jun 2008 23:32:00 -0000 1.12 @@ -1 +1 @@ -kiwi-1.9.21.tar.gz +kiwi-1.9.22.tar.gz Index: python-kiwi.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-kiwi/F-9/python-kiwi.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- python-kiwi.spec 10 May 2008 18:42:16 -0000 1.15 +++ python-kiwi.spec 30 Jun 2008 23:32:00 -0000 1.16 @@ -2,7 +2,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-kiwi -Version: 1.9.21 +Version: 1.9.22 Release: 1%{?dist} Summary: Framework for Python GUI applications @@ -94,6 +94,9 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev <icon(a)fedoraproject.org> - 1.9.22-1 +- Upstream 1.9.22 + * Sat May 10 2008 Konstantin Ryabitsev <icon(a)fedoraproject.org> - 1.9.21-1 - Upstream 1.9.21 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-kiwi/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 May 2008 18:42:16 -0000 1.11 +++ sources 30 Jun 2008 23:32:00 -0000 1.12 @@ -1 +1 @@ -4b283bcab44bacdee7311439269e87c4 kiwi-1.9.21.tar.gz +ba43354d11c6421da17197fd08e31870 kiwi-1.9.22.tar.gz

1 0

rpms/python-kiwi/F-8 .cvsignore, 1.10, 1.11 python-kiwi.spec, 1.12, 1.13 sources, 1.10, 1.11
by fedora-extras-commits＠redhat.com 01 Jul '08

01 Jul '08

Author: icon Update of /cvs/pkgs/rpms/python-kiwi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22428/F-8 Modified Files: .cvsignore python-kiwi.spec sources Log Message: Upstream 1.9.22 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-kiwi/F-8/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 10 May 2008 18:42:04 -0000 1.10 +++ .cvsignore 30 Jun 2008 23:31:38 -0000 1.11 @@ -1 +1 @@ -kiwi-1.9.21.tar.gz +kiwi-1.9.22.tar.gz Index: python-kiwi.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-kiwi/F-8/python-kiwi.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- python-kiwi.spec 10 May 2008 18:42:04 -0000 1.12 +++ python-kiwi.spec 30 Jun 2008 23:31:38 -0000 1.13 @@ -2,7 +2,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-kiwi -Version: 1.9.21 +Version: 1.9.22 Release: 1%{?dist} Summary: Framework for Python GUI applications @@ -94,6 +94,9 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev <icon(a)fedoraproject.org> - 1.9.22-1 +- Upstream 1.9.22 + * Sat May 10 2008 Konstantin Ryabitsev <icon(a)fedoraproject.org> - 1.9.21-1 - Upstream 1.9.21 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-kiwi/F-8/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 10 May 2008 18:42:04 -0000 1.10 +++ sources 30 Jun 2008 23:31:38 -0000 1.11 @@ -1 +1 @@ -4b283bcab44bacdee7311439269e87c4 kiwi-1.9.21.tar.gz +ba43354d11c6421da17197fd08e31870 kiwi-1.9.22.tar.gz

1 0

rpms/opensm/F-8 opensm-3.2.1-rpath.patch, NONE, 1.1 opensm.conf, NONE, 1.1 opensm.initd, NONE, 1.1 opensm.logrotate, NONE, 1.1 opensm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by fedora-extras-commits＠redhat.com 01 Jul '08

01 Jul '08

Author: dledford Update of /cvs/extras/rpms/opensm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21798 Modified Files: .cvsignore sources Added Files: opensm-3.2.1-rpath.patch opensm.conf opensm.initd opensm.logrotate opensm.spec Log Message: * Sun Jun 08 2008 Doug Ledford <dledford(a)redhat.com> - 3.2.1-1 - Initial package for Fedora review process opensm-3.2.1-rpath.patch: --- NEW FILE opensm-3.2.1-rpath.patch --- --- opensm-3.2.1/libvendor/Makefile.am.rpath 2008-01-15 15:23:51.000000000 -0500 +++ opensm-3.2.1/libvendor/Makefile.am 2008-06-30 11:03:22.000000000 -0400 @@ -94,8 +94,8 @@ EXTRA_DIST = $(srcdir)/libosmvendor.map # name. What we can do it create a link to the installed file such # that it will mark it with an alias... # we find the new lib by traversing the links -install-exec-hook: - if test -L $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; fi; \ - lname=`\ls -l $(DESTDIR)/$(libdir)/libosmvendor.so | awk '{print $$NF}'`; \ - ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor_$(with_osmv).so; \ - ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so +#install-exec-hook: +# if test -L $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; fi; \ +# lname=`\ls -l $(DESTDIR)/$(libdir)/libosmvendor.so | awk '{print $$NF}'`; \ +# ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor_$(with_osmv).so; \ +# ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so --- opensm-3.2.1/opensm/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400 +++ opensm-3.2.1/opensm/Makefile.am 2008-06-30 11:11:40.000000000 -0400 @@ -79,7 +79,7 @@ endif if OSMV_SIM USEGPPLINK = $(LIBTOOL) --mode=link g++ $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ libopensm.la: $(libopensm_la_OBJECTS) $(libopensm_la_DEPENDENCIES) - $(USEGPPLINK) -rpath $(libdir) $(libopensm_la_LDFLAGS) $(libopensm_la_OBJECTS) $(libopensm_la_LIBADD) $(LIBS) + $(USEGPPLINK) $(libopensm_la_LDFLAGS) $(libopensm_la_OBJECTS) $(libopensm_la_LIBADD) $(LIBS) opensm$(EXEEXT): $(opensm_OBJECTS) $(opensm_DEPENDENCIES) @rm -f opensm$(EXEEXT) $(USEGPPLINK) $(opensm_LDFLAGS) $(opensm_OBJECTS) $(opensm_LDADD) $(LIBS) @@ -87,9 +87,9 @@ endif # we need to be able to load libraries from local build subtree before make install # we always give precedence to local tree libs and then use the pre-installed ones. -opensm_LDADD = -L../complib -L../libvendor -L. $(OSMV_LDADD) -lopensm -losmcomp -losmvendor +opensm_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor -L. -lopensm -opensm_LDFLAGS = -Wl,--rpath -Wl,$(libdir) -lpthread -ldl +opensm_LDFLAGS = -lpthread -ldl opensmincludedir = $(includedir)/infiniband/opensm @@ -124,10 +124,10 @@ EXTRA_DIST = $(srcdir)/libopensm.map $(s # name. What we can do it create a link to the installed file such # that it will mark it with an alias... # we find the new lib by traversing the links -install-exec-hook: - if test -L $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; fi; \ - lname=`\ls -l $(DESTDIR)/$(libdir)/libopensm.so | awk '{print $$NF}'`; \ - ln -s $$lname $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so +#install-exec-hook: +# if test -L $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; fi; \ +# lname=`\ls -l $(DESTDIR)/$(libdir)/libopensm.so | awk '{print $$NF}'`; \ +# ln -s $$lname $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so # generate c and h files from the lex and yacc files dist-hook: $(srcdir)/osm_qos_parser_y.c $(srcdir)/osm_qos_parser_l.c --- opensm-3.2.1/osmtest/Makefile.am.rpath 2008-03-12 17:43:17.000000000 -0400 +++ opensm-3.2.1/osmtest/Makefile.am 2008-06-30 11:03:22.000000000 -0400 @@ -18,10 +18,10 @@ osmtest_CFLAGS = -Wall $(OSMV_CFLAGS) -D else osmtest_CFLAGS = -Wall $(OSMV_CFLAGS) -DVENDOR_RMPP_SUPPORT $(DBGFLAGS) endif -osmtest_LDADD = -L../complib -L../libvendor -L../opensm -L$(libdir) -L. \ - $(OSMV_LDADD) -lopensm -losmcomp -losmvendor +osmtest_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor \ + -L../opensm -lopensm -osmtest_LDFLAGS = -Wl,--rpath -Wl,$(libdir) -lpthread -L../opensm +osmtest_LDFLAGS = -lpthread # for linking with the simulator client library we have to use g++: if OSMV_SIM USEGPPLINK = $(LIBTOOL) --mode=link g++ $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --- opensm-3.2.1/complib/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400 +++ opensm-3.2.1/complib/Makefile.am 2008-06-30 11:03:22.000000000 -0400 @@ -85,7 +85,7 @@ EXTRA_DIST = $(srcdir)/libosmcomp.map $( # name. What we can do it create a link to the installed file such # that it will mark it with an alias... # we find the new lib by traversing the links -install-exec-hook: - if test -L $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; fi; \ - lname=`\ls -l $(DESTDIR)/$(libdir)/libosmcomp.so | awk '{print $$NF}'`; \ - ln -s $$lname $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so +#install-exec-hook: +# if test -L $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; fi; \ +# lname=`\ls -l $(DESTDIR)/$(libdir)/libosmcomp.so | awk '{print $$NF}'`; \ +# ln -s $$lname $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so --- opensm-3.2.1/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400 +++ opensm-3.2.1/Makefile.am 2008-06-30 11:03:22.000000000 -0400 @@ -9,16 +9,16 @@ MAINTAINERCLEANFILES = Makefile.in acloc ACLOCAL = aclocal -I $(ac_aux_dir) # we should provide a hint for other apps about the build mode of this project -install-exec-hook: - mkdir -p $(DESTDIR)/$(includedir) -if DEBUG - echo "define osm_build_type \"debug\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h -else - echo "define osm_build_type \"free\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h -endif - $(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/init.d - cp $(top_builddir)/scripts/opensm.init $(DESTDIR)/$(sysconfdir)/init.d/opensmd - chmod 755 $(DESTDIR)/$(sysconfdir)/init.d/opensmd +#install-exec-hook: +# mkdir -p $(DESTDIR)/$(includedir) +#if DEBUG +# echo "define osm_build_type \"debug\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h +#else +# echo "define osm_build_type \"free\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h +#endif +# $(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/init.d +# cp $(top_builddir)/scripts/opensm.init $(DESTDIR)/$(sysconfdir)/init.d/opensmd +# chmod 755 $(DESTDIR)/$(sysconfdir)/init.d/opensmd man_MANS = man/opensm.8 man/osmtest.8 --- NEW FILE opensm.conf --- OPTIONS="-B" # DEBUG mode # This option specifies a debug option. # These options are not normally needed. # The number following -d selects the debug # option to enable as follows: # OPT Description # --- ----------------- # 0 - Ignore other SM nodes. # 1 - Force single threaded dispatching. # 2 - Force log flushing after each log message. # 3 - Disable multicast support. # 4 - Put OpenSM in memory tracking mode. # 10.. Put OpenSM in testability mode. # none, no debug options are enabled. # OPTIONS="$OPTIONS -d 1" # LMC # This option specifies the subnet's LMC value. # The number of LIDs assigned to each port is 2^LMC. # The LMC value must be in the range 0-7. # LMC values > 0 allow multiple paths between ports. # LMC values > 0 should only be used if the subnet # topology actually provides multiple paths between # ports, i.e. multiple interconnects between switches. # OpenSM defaults to LMC = 0, which allows # one path between any two ports. # OPTIONS="$OPTIONS -l 0" # MAXSMPS # This option specifies the number of VL15 SMP MADs # allowed on the wire at any one time. # Specifying -maxsmps 0 allows unlimited outstanding SMPs. # Without -maxsmps, OpenSM defaults to a maximum of # four outstanding SMP. OPTIONS="$OPTIONS -maxsmps 0" # REASSIGN_LIDS # This option causes OpenSM to reassign LIDs to all # end nodes. Specifying "REASSIGN_LIDS=yes" on a running subnet # may disrupt subnet traffic. # With "REASSIGN_LIDS=no", OpenSM attempts to preserve existing # LID assignments resolving multiple use of same LID. # OPTIONS="$OPTIONS -r" # SWEEP # This option specifies the number of seconds between # subnet sweeps. Specifying SWEEP=0 disables sweeping. # OpenSM defaults to a sweep interval of 10 seconds. # OPTIONS="$OPTIONS -s 10" # TIMEOUT # This option specifies the time in milliseconds # used for transaction timeouts. # Specifying -t 0 disables timeouts. # Without -t, OpenSM defaults to a timeout value of # 200 milliseconds. # OPTIONS="$OPTIONS -t 200" # OSM_LOG # This option defines the log to be the given file. # By default the log goes to /tmp/osm.log, which isn't very suitable # for a distribution, so we override it by default here. # For the log to go to standard output use OSM_LOG=stdout. OPTIONS="$OPTIONS -f /var/log/opensm.log" # QoS # This option enable QoS support in opensm # OPTIONS="$OPTIONS -Q" # QoS_POLICY # This option sets the file from which to load the QoS policy # OPTIONS="$OPTIONS -Y /etc/rdma/qos_policy" # VERBOSE # This option increases the log verbosity level. # The "-v" option may be specified multiple times # to further increase the verbosity level. # "-V" option sets the maximum verbosity level and # forces log flushing. # The "-V" is equivalent to "-vf 0xFF -d 2". # OPTIONS="$OPTIONS -v 0x00" # ROUTING_ENGINE # This option chooses the routing engine to use instead of the default # algorithm Min Hop # Supported engines are: updn, file, ftree, lash, dor # OPTIONS="$OPTIONS -R updn" # ROOT_GUID_FILE # This option only allowed when UPDN algorithm is activated # It specifies the guid list file from which to fetch the root node guid list # The file contain in each line only one valid guid # OPTIONS="$OPTIONS -a /etc/rdma/root_guids" # CN_GUID_FILE # This option only allowed when UPDN algorithm is activated # It specifies the guid list file from which to fetch the compute node # guid list # The file contain in each line only one valid guid # OPTIONS="$OPTIONS -u /etc/rdma/cn_guids" # GUID # This option specifies the local port GUID value # with which OpenSM should bind. OpenSM may be # bound to 1 port at a time. # If GUID given is 0, opensm would list the available guids and wait for # the user to select one (which obviously is no use in an init script) # Without -g, OpenSM trys to use the default port. # OPTIONS="$OPTIONS -g <guid in hex>" # PRIORITY # This option specifies the SM's PRIORITY. # This will effect the handover cases, where master # is chosen by priority and GUID. Range goes # from 0 (lowest priority) to 15 (highest). OPTIONS="$OPTIONS -p 15" # OSM_CACHE_DIR # There is no command line option to opensm to set this, it can only be set # as an environment variable. OSM_CACHE_DIR=/var/cache/opensm # CACHE_OPTIONS # Cache the given command line options into the file # OSM_CACHE_DIR/opensm.opts for use next invocation # Set to '--cache-options' or '-c' in order to enable # OPTIONS="$OPTIONS -c" --- NEW FILE opensm.initd --- #!/bin/bash # # Bring up/down opensm # # chkconfig: - 15 85 # description: Activates/Deactivates InfiniBand Subnet Manager # config: /etc/rdma/opensm.conf # ### BEGIN INIT INFO # Provides: opensm # Default-Stop: 0 1 2 3 4 5 6 # Required-Start: $rdma # Short-Description: Starts/Stops the InfiniBand Subnet Manager # Description: Starts/Stops the InfiniBand Subnet Manager ### END INIT INFO . /etc/rc.d/init.d/functions prog=/usr/sbin/opensm CONFIG=/etc/rdma/opensm.conf PID_FILE=/var/run/opensm.pid start() { local OSM_PID= if [ ! -f $CONFIG ]; then echo -n "Starting opensm: $CONFIG missing" echo_failure return 6 fi . $CONFIG [ -f /var/lock/subsys/opensm ] && return 0 # Start opensm echo -n "Starting IB Subnet Manager:" $prog $OPTIONS > /dev/null 2>&1 & OSM_PID=$! sleep 1 checkpid $OSM_PID RC=$? [ $RC -eq 0 ] && echo_success || echo_failure [ $RC -eq 0 ] && touch /var/lock/subsys/opensm [ $RC -eq 0 ] && echo $OSM_PID > $PID_FILE echo return $RC } stop() { [ -f /var/lock/subsys/opensm ] || return 0 echo -n "Stopping IB Subnet Manager." OSM_PID=`cat $PID_FILE` checkpid "$OSM_PID" RC=$? if [ $RC -ne 0 ]; then rm -f $PID_FILE rm -f /var/lock/subsys/opensm echo_success return 0 fi # Kill opensm kill -15 $OSM_PID > /dev/null 2>&1 cnt=0 while [ $cnt -lt 6 -a checkpid $OSM_PID -eq 0 ]; do echo -n "." sleep 1 let cnt++ done if [ checkpid $OSM_PID -eq 0 ]; then kill -KILL $OSM_PID > /dev/null 2>&1 echo -n "+" sleep 1 fi checkpid $pid DEAD=$? if [ $DEAD -eq 0 ]; then echo_failure echo return 1 fi echo_success echo # Remove pid file if any. rm -f $PID_FILE rm -f /var/lock/subsys/opensm return 0 } restart () { stop start } condrestart () { [ -f /var/lock/subsys/opensm ] && restart || return 0 } reload () { [ -f $PID_FILE ] || return 0 OSM_PID=`cat $PID_FILE` action $"Rescanning IB Subnet:" kill -HUP $OSM_PID return $? } usage () { echo echo "Usage: `basename $0` {start|stop|restart|condrestart|try-restart|force-reload|status}" echo return 2 } case $ACTION in start) start; RC=$? ;; stop) stop; RC=$? ;; restart) restart; RC=$? ;; reload) reload; RC=$? ;; condrestart) condrestart; RC=$? ;; try-restart) condrestart; RC=$? ;; force-reload) condrestart; RC=$? ;; status) status $prog; RC=$? ;; *) usage; RC=$? ;; esac exit $RC --- NEW FILE opensm.logrotate --- /var/log/opensm.log { missingok notifempty copytruncate weekly compress } --- NEW FILE opensm.spec --- Name: opensm Version: 3.2.1 Release: 1%{?dist} Summary: OpenIB InfiniBand Subnet Manager and management utilities Group: System Environment/Daemons License: GPLv2 or BSD Url: http://www.openfabrics.org/ Source0: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz Source1: opensm.conf Source2: opensm.logrotate Source3: opensm.initd Patch0: opensm-3.2.1-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libibmad-devel >= 1.2.0, libtool Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma %description OpenSM is the OpenIB project's Subnet Manager for Infiniband networks. The subnet manager is run as a system daemon on one of the machines in the infiniband fabric to manage the fabric's routing state. This package also contains various tools for diagnosing and testing Infiniband networks that can be used from any machine and do not need to be run on a machine running the opensm daemon. %package libs Summary: Libraries used by opensm and included utilities Group: System Environment/Libraries %description libs Shared libraries for Infiniband user space access %package devel Summary: Development files for the opensm-libs libraries Group: Development/System Requires: %{name}-libs = %{version}-%{release} %description devel Development environment for the opensm libraries %package static Summary: Static version of the opensm libraries Group: Development/System Requires: %{name}-devel = %{version}-%{release} %description static Static version of opensm libraries %prep %setup -q %patch0 -p1 -b .rpath ./autogen.sh %build %configure --with-opensm-conf-sub-dir=rdma make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rdma/opensm.conf install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/opensm install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/opensm mkdir -p ${RPM_BUILD_ROOT}/var/cache/opensm %clean rm -rf $RPM_BUILD_ROOT %post if [ $1 = 1 ]; then /sbin/chkconfig --add opensm else /sbin/service opensm condrestart fi %preun if [ $1 = 0 ]; then /sbin/service opensm stop /sbin/chkconfig --del opensm rm -f /var/cache/opensm/* fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %dir /var/cache/opensm %{_sbindir}/* %{_initrddir}/opensm %{_mandir}/man8/* %config(noreplace) %{_sysconfdir}/logrotate.d/opensm %config(noreplace) %{_sysconfdir}/rdma/opensm.conf %doc AUTHORS COPYING ChangeLog INSTALL README NEWS %files libs %defattr(-,root,root,-) %{_libdir}/lib*.so.* %files devel %defattr(-,root,root,-) %{_libdir}/lib*.so %{_includedir}/infiniband %files static %defattr(-,root,root,-) %{_libdir}/lib*.a %changelog * Sun Jun 08 2008 Doug Ledford <dledford(a)redhat.com> - 3.2.1-1 - Initial package for Fedora review process Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opensm/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 20:02:44 -0000 1.1 +++ .cvsignore 30 Jun 2008 23:24:10 -0000 1.2 @@ -0,0 +1 @@ +opensm-3.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/opensm/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 20:02:44 -0000 1.1 +++ sources 30 Jun 2008 23:24:10 -0000 1.2 @@ -0,0 +1 @@ +997d10f81896a0d70e0f21f0e78eca92 opensm-3.2.1.tar.gz

1 0

rpms/fedora-release/OLPC-3 fedora-release.spec,1.67,1.68
by fedora-extras-commits＠redhat.com 01 Jul '08

01 Jul '08

Author: ausil Update of /cvs/pkgs/rpms/fedora-release/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20875 Modified Files: fedora-release.spec Log Message: update releasever to 9 Index: fedora-release.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release/OLPC-3/fedora-release.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- fedora-release.spec 14 Apr 2008 17:07:38 -0000 1.67 +++ fedora-release.spec 30 Jun 2008 23:15:49 -0000 1.68 @@ -3,8 +3,8 @@ Summary: OLPC release files Name: fedora-release -Version: 8.93 -Release: 2 +Version: 9 +Release: 1.1 License: GPLv2 Group: System Environment/Base URL: http://laptop.org @@ -89,6 +89,9 @@ /etc/pki/rpm-gpg/* %changelog +* Mon Jun 30 2008 Dennis Gilmore <dennis(a)laptop.org> - 9-1.1 +- update releasever to 9 + * Mon Apr 14 2008 Dennis Gilmore <dennis(a)laptop.org> - 8.93-2 - setup for olpc

1 0

rpms/twinkle/devel twinkle-1.2-zrtpgcc43.patch, NONE, 1.1 twinkle.spec, 1.13, 1.14
by fedora-extras-commits＠redhat.com 01 Jul '08

01 Jul '08

Author: kevin Update of /cvs/extras/rpms/twinkle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19613 Modified Files: twinkle.spec Added Files: twinkle-1.2-zrtpgcc43.patch Log Message: Rebuild with libzrtpcpp twinkle-1.2-zrtpgcc43.patch: --- NEW FILE twinkle-1.2-zrtpgcc43.patch --- diff -Nur -x '*.orig' -x '*~' twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp twinkle-1.2.new/src/audio/twinkle_zrtp_ui.cpp --- twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp 2008-02-27 08:10:50.000000000 +1100 +++ twinkle-1.2.new/src/audio/twinkle_zrtp_ui.cpp 2008-05-31 11:30:59.000000000 +1000 @@ -32,7 +32,7 @@ extern t_phone *phone; TwinkleZrtpUI::TwinkleZrtpUI(ZrtpQueue* queue, t_audio_session* session) : - ZrtpUserCallback(queue), audioSession(session) + ZrtpUserCallback(), audioSession(session) {} void TwinkleZrtpUI::secureOn(std::string cipher) { @@ -96,7 +96,7 @@ ui->cb_async_zrtp_confirm_go_clear(lineno); } -void TwinkleZrtpUI::showMessage(MessageSeverity sev, std::string message) { +void TwinkleZrtpUI::showMessage(GnuZrtpCodes::MessageSeverity sev, std::string message) { t_line *line = audioSession->get_line(); int lineno = line->get_line_number(); @@ -106,11 +106,11 @@ msg += message; switch (sev) { - case Info: + case GnuZrtpCodes::Info: log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL, LOG_INFO); break; - case Warning: + case GnuZrtpCodes::Warning: log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL, LOG_WARNING); break; @@ -120,7 +120,7 @@ } } -void TwinkleZrtpUI::zrtpNegotiationFailed(MessageSeverity severity, std::string msg) { +void TwinkleZrtpUI::zrtpNegotiationFailed(GnuZrtpCodes::MessageSeverity severity, std::string msg) { t_line *line = audioSession->get_line(); int lineno = line->get_line_number(); @@ -130,11 +130,11 @@ m += msg; switch (severity) { - case Info: + case GnuZrtpCodes::Info: log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL, LOG_INFO); break; - case Warning: + case GnuZrtpCodes::Warning: log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL, LOG_WARNING); break; diff -Nur -x '*.orig' -x '*~' twinkle-1.2/src/audio/twinkle_zrtp_ui.h twinkle-1.2.new/src/audio/twinkle_zrtp_ui.h --- twinkle-1.2/src/audio/twinkle_zrtp_ui.h 2008-02-27 08:10:48.000000000 +1100 +++ twinkle-1.2.new/src/audio/twinkle_zrtp_ui.h 2008-05-31 11:30:20.000000000 +1000 @@ -44,8 +44,8 @@ virtual void secureOff(); virtual void showSAS(std::string sas); virtual void confirmGoClear(); - virtual void showMessage(MessageSeverity sev, std::string message); - virtual void zrtpNegotiationFailed(MessageSeverity severity, std::string msg); + virtual void showMessage(GnuZrtpCodes::MessageSeverity sev, std::string message); + virtual void zrtpNegotiationFailed(GnuZrtpCodes::MessageSeverity severity, std::string msg); virtual void zrtpNotSuppOther(); private: Index: twinkle.spec =================================================================== RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- twinkle.spec 1 Apr 2008 01:45:29 -0000 1.13 +++ twinkle.spec 30 Jun 2008 23:01:41 -0000 1.14 @@ -1,6 +1,6 @@ Name: twinkle Version: 1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A SIP Soft Phone Group: Applications/Internet @@ -9,6 +9,7 @@ Source0: http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz Patch0: twinkle-1.1-msg.patch Patch1: twinkle-1.2-gcc43.patch +Patch2: twinkle-1.2-zrtpgcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: commoncpp2-devel @@ -21,6 +22,7 @@ BuildRequires: alsa-lib-devel BuildRequires: kdelibs3-devel BuildRequires: bison +BuildRequires: libzrtpcpp-devel %description Twinkle is a SIP based soft phone for making telephone calls over IP networks. @@ -29,6 +31,7 @@ %setup -q %patch0 -p1 -b .msg %patch1 -p1 -b .gcc43 +%patch2 -p1 -b .zrtpgcc43 %build %configure @@ -61,6 +64,9 @@ %{_datadir}/applications/fedora-twinkle.desktop %changelog +* Mon Jun 30 2008 Kevin Fenzi <kevin(a)tummy.com> - 1.2-3 +- Rebuild with libzrtpcpp + * Mon Mar 31 2008 Kevin Fenzi <kevin(a)tummy.com> - 1.2-2 - Rebuild for new qt3

1 0

rpms/kernel/devel kernel.spec,1.723,1.724
by fedora-extras-commits＠redhat.com 30 Jun '08

30 Jun '08

Author: cebbert Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12355 Modified Files: kernel.spec Log Message: * Mon Jun 30 2008 Chuck Ebbert <cebbert(a)redhat.com> - Disable the selinux ecryptfs support patch; it broke ntfs-3g (#452438) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.723 retrieving revision 1.724 diff -u -r1.723 -r1.724 --- kernel.spec 30 Jun 2008 19:52:09 -0000 1.723 +++ kernel.spec 30 Jun 2008 22:39:57 -0000 1.724 @@ -1139,7 +1139,8 @@ ApplyPatch linux-2.6-selinux-generic-ioctl.patch ApplyPatch linux-2.6-selinux-new-proc-checks.patch ApplyPatch linux-2.6-selinux-get-invalid-xattrs.patch -ApplyPatch linux-2.6-selinux-ecryptfs-support.patch +# Broken, see BZ 452438 +#ApplyPatch linux-2.6-selinux-ecryptfs-support.patch # wireless patches headed for 2.6.26 ApplyPatch linux-2.6-wireless.patch @@ -1787,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Mon Jun 30 2008 Chuck Ebbert <cebbert(a)redhat.com> +- Disable the selinux ecryptfs support patch; it broke ntfs-3g (#452438) + * Mon Jun 30 2008 Dave Jones <davej(a)redhat.com> - Disable rio500 driver (bz 451567)

1 0

rpms/perl-Test-WWW-Selenium/EL-5 import.log, NONE, 1.1 perl-Test-WWW-Selenium.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by fedora-extras-commits＠redhat.com 30 Jun '08

30 Jun '08

Author: lkundrak Update of /cvs/pkgs/rpms/perl-Test-WWW-Selenium/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11745/EL-5 Modified Files: .cvsignore sources Added Files: import.log perl-Test-WWW-Selenium.spec Log Message: Initial import --- NEW FILE import.log --- perl-Test-WWW-Selenium-1_15-2_el5:EL-5:perl-Test-WWW-Selenium-1.15-2.el5.src.rpm:1214864410 --- NEW FILE perl-Test-WWW-Selenium.spec --- Name: perl-Test-WWW-Selenium Version: 1.15 Release: 2%{?dist} Summary: Perl Client for the Selenium Remote Control test tool License: (GPL+ or Artistic) and ASL 2.0 Group: Development/Libraries URL: http://search.cpan.org/dist/Test-WWW-Selenium/ Source0: http://www.perl.org/authors/id/L/LU/LUKEC/Test-WWW-Selenium-0.15.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) >= 0.42 BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::Mock::LWP) BuildRequires: perl(Test::Pod) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(URI::Escape) >= 1.31 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Selenium Remote Control (SRC) is a test tool that allows you to write automated web application UI tests in any programming language against any HTTP website using any mainstream JavaScript-enabled browser. SRC provides a Selenium Server, which can automatically start/stop/control any supported browser. It works by using Selenium Core, a pure-HTML+JS library that performs automated tasks in JavaScript; the Selenium Server communicates directly with the browser using AJAX (XmlHttpRequest). %prep %setup -q -n Test-WWW-Selenium-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README todo.txt %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Jun 23 2008 Lubomir Rintel (Good Data) <lubo.rintel(a)gooddata.com> 0.15-2 - Fixed License tag to include Apache, thanks Parag AN * Mon Jun 16 2008 Lubomir Rintel (Good Data) <lubo.rintel(a)gooddata.com> 0.15-1 - Specfile autogenerated by cpanspec 1.75. - Fix requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-WWW-Selenium/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 16:23:30 -0000 1.1 +++ .cvsignore 30 Jun 2008 22:20:48 -0000 1.2 @@ -0,0 +1 @@ +Test-WWW-Selenium-0.15.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-WWW-Selenium/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 16:23:30 -0000 1.1 +++ sources 30 Jun 2008 22:20:48 -0000 1.2 @@ -0,0 +1 @@ +932a71581ebfaad8bc544aa1eae39c5e Test-WWW-Selenium-0.15.tar.gz

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits June 2008